diff --git a/.buildconfig.yml b/.buildconfig.yml
index 808a4246c..8d4747695 100644
--- a/.buildconfig.yml
+++ b/.buildconfig.yml
@@ -35,6 +35,7 @@ projects:
     - feature-customtabs
     - feature-downloads
     - feature-findinpage
+    - feature-fxsuggest
     - feature-intent
     - feature-logins
     - feature-media
diff --git a/app/.experimenter.yaml b/app/.experimenter.yaml
index 3cb3f80e4..6689c7550 100644
--- a/app/.experimenter.yaml
+++ b/app/.experimenter.yaml
@@ -15,6 +15,14 @@ extensions-process:
     enabled:
       type: boolean
       description: "If true, the extensions process is enabled."
+fx-suggest:
+  description: A feature that provides Firefox Suggest search suggestions.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    enabled:
+      type: boolean
+      description: "Whether the feature is enabled. When Firefox Suggest is enabled, Firefox will download and store new search suggestions in the background, and show additional Search settings to control which suggestions appear in the awesomebar. When Firefox Suggest is disabled, Firefox will not download new suggestions, and hide the additional Search settings.\n"
 glean:
   description: A feature that provides server-side configurations for Glean metrics (aka Server Knobs).
   hasExposure: true
@@ -47,9 +55,6 @@ juno-onboarding:
     cards:
       type: json
       description: Collection of user facing onboarding cards.
-    enabled:
-      type: boolean
-      description: "if true, juno onboarding is shown to the user."
 messaging:
   description: "The in-app messaging system.\n"
   hasExposure: true
@@ -199,6 +204,9 @@ shopping-experience:
     enabled:
       type: boolean
       description: "if true, the shopping experience feature is shown to the user."
+    product-recommendations:
+      type: boolean
+      description: "if true, recommended products feature is enabled to be shown to the user based on their preference."
 splash-screen:
   description: "A feature that extends splash screen duration, allowing additional data fetching time for the app's initial run."
   hasExposure: true
diff --git a/app/build.gradle b/app/build.gradle
index 0d5e62be5..3308feb7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,4 @@
+import com.android.build.api.variant.FilterConfiguration
 import org.apache.tools.ant.util.StringUtils
 
 plugins {
@@ -12,18 +13,16 @@ apply plugin: 'jacoco'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
-import com.android.build.OutputFile
 import groovy.json.JsonOutput
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 import static org.gradle.api.tasks.testing.TestResult.ResultType
 
 apply from: 'benchmark.gradle'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-
     project.maybeConfigForJetpackBenchmark(it)
     if (project.hasProperty("testBuildType")) {
         // Allowing to configure the test build type via command line flag (./gradlew -PtestBuildType=beta ..)
@@ -34,6 +33,7 @@ android {
     defaultConfig {
         applicationId "io.github.forkmaintainers"
         minSdkVersion config.minSdkVersion
+        compileSdk config.compileSdkVersion
         targetSdkVersion config.targetSdkVersion
         versionCode 1
         versionName Config.generateDebugVersionName()
@@ -218,9 +218,7 @@ android {
         animationsDisabled = true
     }
 
-    flavorDimensions "engine"
-
-    flavorDimensions "product"
+    flavorDimensions.add("product")
 
     productFlavors {
         fenix {
@@ -286,7 +284,7 @@ android {
     namespace 'org.mozilla.fenix'
 }
 
-android.applicationVariants.all { variant ->
+android.applicationVariants.configureEach { variant ->
 
 // -------------------------------------------------------------------------------------------------
 // Generate version codes for builds
@@ -312,7 +310,7 @@ android.applicationVariants.all { variant ->
 
         variant.outputs.each { output ->
             def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
-            def abi = output.getFilter(OutputFile.ABI)
+            def abi = output.getFilter(FilterConfiguration.FilterType.ABI.name())
             // If it is a Mozilla Online build, use a unified version code of armeabi-v7a
             def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
@@ -507,12 +505,8 @@ nimbus {
     experimenterManifest = ".experimenter.yaml"
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    kotlinOptions {
-        freeCompilerArgs += [
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-        ]
-    }
+tasks.withType(KotlinCompile).configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
 }
 
 dependencies {
@@ -559,6 +553,7 @@ dependencies {
     implementation project(':feature-contextmenu')
     implementation project(':feature-customtabs')
     implementation project(':feature-downloads')
+    implementation project(':feature-fxsuggest')
     implementation project(':feature-intent')
     implementation project(':feature-media')
     implementation project(':feature-prompts')
@@ -635,7 +630,7 @@ dependencies {
     implementation FenixDependencies.androidx_navigation_fragment
     implementation FenixDependencies.androidx_navigation_ui
     implementation ComponentsDependencies.androidx_recyclerview
-    implementation FenixDependencies.androidx_lifecycle_common
+    implementation ComponentsDependencies.androidx_lifecycle_common
     implementation ComponentsDependencies.androidx_lifecycle_livedata
     implementation ComponentsDependencies.androidx_lifecycle_process
     implementation ComponentsDependencies.androidx_lifecycle_runtime
@@ -737,13 +732,13 @@ if (project.hasProperty("coverage")) {
         toolVersion = Versions.jacoco
     }
 
-    android.applicationVariants.all { variant ->
+    android.applicationVariants.configureEach { variant ->
         tasks.register("jacoco${variant.name.capitalize()}TestReport", JacocoReport) {
             dependsOn "test${variant.name.capitalize()}UnitTest"
 
             reports {
-                xml.enabled = true
-                html.enabled = true
+                xml.required = true
+                html.required = true
             }
 
             def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*',
@@ -782,7 +777,7 @@ tasks.register('printVariants') {
     doLast {
         def variants = android.applicationVariants.collect { variant -> [
             apks: variant.outputs.collect { output -> [
-                abi: output.getFilter(com.android.build.VariantOutput.FilterType.ABI),
+                abi: output.getFilter(FilterConfiguration.FilterType.ABI.name()),
                 fileName: output.outputFile.name
             ]},
             build_type: variant.buildType.name,
@@ -801,22 +796,22 @@ tasks.register('printVariants') {
     }
 }
 
-task buildTranslationArray {
+tasks.register('buildTranslationArray') {
     // This isn't running as a task, instead the array is build when the gradle file is parsed.
     // https://github.com/mozilla-mobile/fenix/issues/14175
     def foundLocales = new StringBuilder()
     foundLocales.append("new String[]{")
 
     fileTree("src/main/res").visit { FileVisitDetails details ->
-        if(details.file.path.endsWith("${File.separator}strings.xml")){
-            def languageCode = details.file.parent.tokenize(File.separator).last().replaceAll('values-','').replaceAll('-r','-')
+        if (details.file.path.endsWith("${File.separator}strings.xml")) {
+            def languageCode = details.file.parent.tokenize(File.separator).last().replaceAll('values-', '').replaceAll('-r', '-')
             languageCode = (languageCode == "values") ? "en-US" : languageCode
             foundLocales.append("\"").append(languageCode).append("\"").append(",")
         }
     }
 
     foundLocales.append("}")
-    def foundLocalesString = foundLocales.toString().replaceAll(',}','}')
+    def foundLocalesString = foundLocales.toString().replaceAll(',}', '}')
     android.defaultConfig.buildConfigField "String[]", "SUPPORTED_LOCALE_ARRAY", foundLocalesString
 }
 
@@ -878,7 +873,7 @@ if (gradle.hasProperty('localProperties.autoPublish.glean.dir')) {
     apply from: "../${gleanSrcDir}/build-scripts/substitute-local-glean.gradle"
 }
 
-android.applicationVariants.all { variant ->
+android.applicationVariants.configureEach { variant ->
     tasks.register("apkSize${variant.name.capitalize()}", ApkSizeTask) {
         variantName = variant.name
         apks = variant.outputs.collect { output -> output.outputFile.name }
diff --git a/app/metrics.yaml b/app/metrics.yaml
index 8aeb63e4a..a578c7c45 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -2539,6 +2539,28 @@ metrics:
     metadata:
       tags:
         - Experiments
+  device_total_ram:
+    type: quantity
+    lifetime: application
+    description: >
+      The total amount of memory this device in bytes, when available will be
+      MemoryInfo.advertisedMem otherwise it will be MemoryInfo.totalMem.
+      This doesn't represent memory available to the application however.
+    send_in_pings:
+      - metrics
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1853967
+    data_reviews:
+      - https://github.com/mozilla-mobile/firefox-android/pull/2620
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - android-probes@mozilla.com
+    expires: never
+    unit: integer
+    metadata:
+      tags:
+        - Performance
   search_page_load_time:
     type: timing_distribution
     time_unit: millisecond
diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index e4bf82adf..697f5a718 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -348,6 +348,10 @@ features:
         description: if true, the shopping experience feature is shown to the user.
         type: Boolean
         default: false
+      product-recommendations:
+        description: if true, recommended products feature is enabled to be shown to the user based on their preference.
+        type: Boolean
+        default: false
     defaults:
       - channel: developer
         value:
@@ -384,6 +388,24 @@ features:
         description: The channel Id param name with arg.
         type: Map<String, String>
         default: {}
+
+  fx-suggest:
+    description: A feature that provides Firefox Suggest search suggestions.
+    variables:
+      enabled:
+        description: >
+          Whether the feature is enabled. When Firefox Suggest is enabled,
+          Firefox will download and store new search suggestions in the
+          background, and show additional Search settings to control which
+          suggestions appear in the awesomebar. When Firefox Suggest is
+          disabled, Firefox will not download new suggestions, and hide the
+          additional Search settings.
+        type: Boolean
+        default: false
+    defaults:
+      - channel: developer
+        value:
+          enabled: true
 types:
   objects: {}
 
diff --git a/app/onboarding.fml.yaml b/app/onboarding.fml.yaml
index 4382e17dc..cb6be10ec 100644
--- a/app/onboarding.fml.yaml
+++ b/app/onboarding.fml.yaml
@@ -5,10 +5,6 @@ features:
     description: A feature that shows juno onboarding flow.
 
     variables:
-      enabled:
-        description: if true, juno onboarding is shown to the user.
-        type: Boolean
-        default: false
       cards:
         description: Collection of user facing onboarding cards.
         type: Map<String, OnboardingCardData>
@@ -51,14 +47,6 @@ features:
               primary-button-label: juno_onboarding_enable_notifications_positive_button
               secondary-button-label: juno_onboarding_enable_notifications_negative_button
 
-    defaults:
-      - channel: developer
-        value:
-          enabled: false
-      - channel: nightly
-        value:
-          enabled: true
-
 objects:
 
   OnboardingCardData:
diff --git a/app/pbm.fml.yaml b/app/pbm.fml.yaml
index 46055d61f..7b22ed8a3 100644
--- a/app/pbm.fml.yaml
+++ b/app/pbm.fml.yaml
@@ -13,7 +13,7 @@ features:
     defaults:
       - channel: developer
         value:
-          felt-privacy-enabled: true
+          felt-privacy-enabled: false
       - channel: nightly
         value:
           felt-privacy-enabled: false
diff --git a/app/src/androidTest/assets/pages/externalLinks.html b/app/src/androidTest/assets/pages/externalLinks.html
index 9007f99b2..755d15ac8 100644
--- a/app/src/androidTest/assets/pages/externalLinks.html
+++ b/app/src/androidTest/assets/pages/externalLinks.html
@@ -8,19 +8,22 @@
 
 <p>Misc Link Types</p>
 <section>
-    <a href="https://duckduckgo.com/">External link</a>
+    <a href="mailto://example@example.com">Email link</a>
 </section>
 
 <section>
-    <a href="mailto://example@example.com">Email link</a>
+    <a href="tel://1234567890">Telephone link</a>
 </section>
 
 <section>
-    <a href="tel://1234567890">Telephone link</a>
+    <a href="vnd.youtube://@Mozilla">Youtube schema link</a>
 </section>
 
 <section>
-    <a href="https://m.youtube.com/user/mozilla?cbrd=1">Youtube link</a>
+    <a href="https://m.youtube.com/user/mozilla?cbrd=1">Youtube full link</a>
 </section>
 
+<section>
+    <a href="http://play.google.com/store/apps/details?id=org.mozilla.firefox">Playstore link</a>
+</section>
 </html>
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile
index 03f589cad..d21a2e8f6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile
@@ -7,6 +7,8 @@ name = "pypi"
 pytest = "*"
 pytest-html = "*"
 pytest-metadata = "*"
+pytest-variables = "*"
+pyyaml = "*"
 requests = "*"
 
 [dev-packages]
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile.lock b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile.lock
index a40cf3ffe..0fb380689 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile.lock
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "917d5c85bd6545dedfbce6aedbd76bd1516993e65943ecfbf7affbece9a2a0ab"
+            "sha256": "53501c7e751ae79697bf8c7289b6095f49fed97242fe186fea42989e800c39d5"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -16,141 +16,94 @@
         ]
     },
     "default": {
-        "black": {
-            "hashes": [
-                "sha256:064101748afa12ad2291c2b91c960be28b817c0c7eaa35bec09cc63aa56493c5",
-                "sha256:0945e13506be58bf7db93ee5853243eb368ace1c08a24c65ce108986eac65915",
-                "sha256:11c410f71b876f961d1de77b9699ad19f939094c3a677323f43d7a29855fe326",
-                "sha256:1c7b8d606e728a41ea1ccbd7264677e494e87cf630e399262ced92d4a8dac940",
-                "sha256:1d06691f1eb8de91cd1b322f21e3bfc9efe0c7ca1f0e1eb1db44ea367dff656b",
-                "sha256:3238f2aacf827d18d26db07524e44741233ae09a584273aa059066d644ca7b30",
-                "sha256:32daa9783106c28815d05b724238e30718f34155653d4d6e125dc7daec8e260c",
-                "sha256:35d1381d7a22cc5b2be2f72c7dfdae4072a3336060635718cc7e1ede24221d6c",
-                "sha256:3a150542a204124ed00683f0db1f5cf1c2aaaa9cc3495b7a3b5976fb136090ab",
-                "sha256:48f9d345675bb7fbc3dd85821b12487e1b9a75242028adad0333ce36ed2a6d27",
-                "sha256:50cb33cac881766a5cd9913e10ff75b1e8eb71babf4c7104f2e9c52da1fb7de2",
-                "sha256:562bd3a70495facf56814293149e51aa1be9931567474993c7942ff7d3533961",
-                "sha256:67de8d0c209eb5b330cce2469503de11bca4085880d62f1628bd9972cc3366b9",
-                "sha256:6b39abdfb402002b8a7d030ccc85cf5afff64ee90fa4c5aebc531e3ad0175ddb",
-                "sha256:6f3c333ea1dd6771b2d3777482429864f8e258899f6ff05826c3a4fcc5ce3f70",
-                "sha256:714290490c18fb0126baa0fca0a54ee795f7502b44177e1ce7624ba1c00f2331",
-                "sha256:7c3eb7cea23904399866c55826b31c1f55bbcd3890ce22ff70466b907b6775c2",
-                "sha256:92c543f6854c28a3c7f39f4d9b7694f9a6eb9d3c5e2ece488c327b6e7ea9b266",
-                "sha256:a6f6886c9869d4daae2d1715ce34a19bbc4b95006d20ed785ca00fa03cba312d",
-                "sha256:a8a968125d0a6a404842fa1bf0b349a568634f856aa08ffaff40ae0dfa52e7c6",
-                "sha256:c7ab5790333c448903c4b721b59c0d80b11fe5e9803d8703e84dcb8da56fec1b",
-                "sha256:e114420bf26b90d4b9daa597351337762b63039752bdf72bf361364c1aa05925",
-                "sha256:e198cf27888ad6f4ff331ca1c48ffc038848ea9f031a3b40ba36aced7e22f2c8",
-                "sha256:ec751418022185b0c1bb7d7736e6933d40bbb14c14a0abcf9123d1b159f98dd4",
-                "sha256:f0bd2f4a58d6666500542b26354978218a9babcdc972722f4bf90779524515f3"
-            ],
-            "index": "pypi",
-            "version": "==23.3.0"
-        },
         "certifi": {
             "hashes": [
-                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
-                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+                "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082",
+                "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2023.5.7"
+            "version": "==2023.7.22"
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6",
-                "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1",
-                "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e",
-                "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373",
-                "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62",
-                "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230",
-                "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be",
-                "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c",
-                "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0",
-                "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448",
-                "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f",
-                "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649",
-                "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d",
-                "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0",
-                "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706",
-                "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a",
-                "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59",
-                "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23",
-                "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5",
-                "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb",
-                "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e",
-                "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e",
-                "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c",
-                "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28",
-                "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d",
-                "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41",
-                "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974",
-                "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce",
-                "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f",
-                "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1",
-                "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d",
-                "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8",
-                "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017",
-                "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31",
-                "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7",
-                "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8",
-                "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e",
-                "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14",
-                "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd",
-                "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d",
-                "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795",
-                "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b",
-                "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b",
-                "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b",
-                "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203",
-                "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f",
-                "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19",
-                "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1",
-                "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a",
-                "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac",
-                "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9",
-                "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0",
-                "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137",
-                "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f",
-                "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6",
-                "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5",
-                "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909",
-                "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f",
-                "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0",
-                "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324",
-                "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755",
-                "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb",
-                "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854",
-                "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c",
-                "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60",
-                "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84",
-                "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0",
-                "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b",
-                "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1",
-                "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531",
-                "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1",
-                "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11",
-                "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326",
-                "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df",
-                "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"
+                "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96",
+                "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c",
+                "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710",
+                "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706",
+                "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020",
+                "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252",
+                "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad",
+                "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329",
+                "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a",
+                "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f",
+                "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6",
+                "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4",
+                "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a",
+                "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46",
+                "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2",
+                "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23",
+                "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace",
+                "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd",
+                "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982",
+                "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10",
+                "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2",
+                "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea",
+                "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09",
+                "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5",
+                "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149",
+                "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489",
+                "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9",
+                "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80",
+                "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592",
+                "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3",
+                "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6",
+                "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed",
+                "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c",
+                "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200",
+                "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a",
+                "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e",
+                "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d",
+                "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6",
+                "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623",
+                "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669",
+                "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3",
+                "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa",
+                "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9",
+                "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2",
+                "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f",
+                "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1",
+                "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4",
+                "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a",
+                "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8",
+                "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3",
+                "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029",
+                "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f",
+                "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959",
+                "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22",
+                "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7",
+                "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952",
+                "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346",
+                "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e",
+                "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d",
+                "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299",
+                "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd",
+                "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a",
+                "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3",
+                "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037",
+                "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94",
+                "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c",
+                "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858",
+                "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a",
+                "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449",
+                "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c",
+                "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918",
+                "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1",
+                "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c",
+                "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac",
+                "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==3.1.0"
-        },
-        "click": {
-            "hashes": [
-                "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
-                "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==8.1.3"
-        },
-        "flake8": {
-            "hashes": [
-                "sha256:3833794e27ff64ea4e9cf5d410082a8b97ff1a06c16aa3d2027339cd0f1195c7",
-                "sha256:c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181"
-            ],
-            "index": "pypi",
-            "version": "==6.0.0"
+            "version": "==3.2.0"
         },
         "idna": {
             "hashes": [
@@ -168,21 +121,69 @@
             "markers": "python_version >= '3.7'",
             "version": "==2.0.0"
         },
-        "mccabe": {
+        "jinja2": {
             "hashes": [
-                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
-                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
+                "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
+                "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.7.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==3.1.2"
         },
-        "mypy-extensions": {
+        "markupsafe": {
             "hashes": [
-                "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
-                "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+                "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e",
+                "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e",
+                "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431",
+                "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686",
+                "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559",
+                "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc",
+                "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c",
+                "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0",
+                "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4",
+                "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9",
+                "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575",
+                "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba",
+                "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d",
+                "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3",
+                "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00",
+                "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155",
+                "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac",
+                "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52",
+                "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f",
+                "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8",
+                "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b",
+                "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24",
+                "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea",
+                "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198",
+                "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0",
+                "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee",
+                "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be",
+                "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2",
+                "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707",
+                "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6",
+                "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58",
+                "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779",
+                "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636",
+                "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c",
+                "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad",
+                "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee",
+                "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc",
+                "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2",
+                "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48",
+                "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7",
+                "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e",
+                "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b",
+                "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa",
+                "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5",
+                "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e",
+                "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb",
+                "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9",
+                "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57",
+                "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc",
+                "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==1.0.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==2.1.3"
         },
         "packaging": {
             "hashes": [
@@ -192,94 +193,219 @@
             "markers": "python_version >= '3.7'",
             "version": "==23.1"
         },
-        "pathspec": {
+        "pluggy": {
             "hashes": [
-                "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687",
-                "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293"
+                "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12",
+                "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.11.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.3.0"
         },
-        "platformdirs": {
+        "pytest": {
             "hashes": [
-                "sha256:b0cabcb11063d21a0b261d557acb0a9d2126350e63b70cdf7db6347baea456dc",
-                "sha256:ca9ed98ce73076ba72e092b23d3c93ea6c4e186b3f1c3dad6edd98ff6ffcca2e"
+                "sha256:2f2301e797521b23e4d2585a0a3d7b5e50fdddaaf7e7d6773ea26ddb17c213ab",
+                "sha256:460c9a59b14e27c602eb5ece2e47bec99dc5fc5f6513cf924a7d03a578991b1f"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.8.0"
+            "index": "pypi",
+            "version": "==7.4.1"
         },
-        "pluggy": {
+        "pytest-html": {
             "hashes": [
-                "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849",
-                "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"
+                "sha256:3b473cc278272f8b5a34cd3bf10f88ac5fcb17cb5af22f9323514af00c310e64",
+                "sha256:79c4677ed6196417bf290d8b81f706342ae49f726f623728efa3f7dfff09f8eb"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.2.0"
+            "index": "pypi",
+            "version": "==4.0.0"
         },
-        "py": {
+        "pytest-metadata": {
             "hashes": [
-                "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719",
-                "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"
+                "sha256:769a9c65d2884bd583bc626b0ace77ad15dbe02dd91a9106d47fd46d9c2569ca",
+                "sha256:a17b1e40080401dc23177599208c52228df463db191c1a573ccdffacd885e190"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==1.11.0"
+            "index": "pypi",
+            "version": "==3.0.0"
         },
-        "pycodestyle": {
+        "pytest-variables": {
             "hashes": [
-                "sha256:347187bdb476329d98f695c213d7295a846d1152ff4fe9bacb8a9590b8ee7053",
-                "sha256:8a4eaf0d0495c7395bdab3589ac2db602797d76207242c17d470186815706610"
+                "sha256:190d9d4da5a6013eb02df2049f6047d911cdbe44c5b1734a6acc1748433c93d0",
+                "sha256:ab84235417afac5a0a7dd4c3918287d9c7329d2e16d570d6e943f8d8e02533b9"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2.10.0"
+            "index": "pypi",
+            "version": "==3.0.0"
         },
-        "pyflakes": {
+        "pyyaml": {
             "hashes": [
-                "sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf",
-                "sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd"
+                "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
+                "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc",
+                "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df",
+                "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741",
+                "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206",
+                "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27",
+                "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595",
+                "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62",
+                "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98",
+                "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696",
+                "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290",
+                "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9",
+                "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d",
+                "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6",
+                "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867",
+                "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47",
+                "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486",
+                "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6",
+                "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3",
+                "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007",
+                "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938",
+                "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0",
+                "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c",
+                "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735",
+                "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d",
+                "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28",
+                "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4",
+                "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba",
+                "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8",
+                "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5",
+                "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd",
+                "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3",
+                "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0",
+                "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515",
+                "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c",
+                "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c",
+                "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924",
+                "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34",
+                "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43",
+                "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859",
+                "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673",
+                "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54",
+                "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a",
+                "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b",
+                "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab",
+                "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa",
+                "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c",
+                "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585",
+                "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
+                "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.0.1"
+            "index": "pypi",
+            "version": "==6.0.1"
         },
-        "pytest": {
+        "requests": {
             "hashes": [
-                "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32",
-                "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"
+                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
             ],
             "index": "pypi",
-            "version": "==7.4.0"
+            "version": "==2.31.0"
         },
-        "pytest-html": {
+        "urllib3": {
             "hashes": [
-                "sha256:868c08564a68d8b2c26866f1e33178419bb35b1e127c33784a28622eb827f3f3",
-                "sha256:c4e2f4bb0bffc437f51ad2174a8a3e71df81bbc2f6894604e604af18fbe687c3"
+                "sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11",
+                "sha256:de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==2.0.4"
+        }
+    },
+    "develop": {
+        "black": {
+            "hashes": [
+                "sha256:01ede61aac8c154b55f35301fac3e730baf0c9cf8120f65a9cd61a81cfb4a0c3",
+                "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb",
+                "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087",
+                "sha256:27eb7a0c71604d5de083757fbdb245b1a4fae60e9596514c6ec497eb63f95320",
+                "sha256:327a8c2550ddc573b51e2c352adb88143464bb9d92c10416feb86b0f5aee5ff6",
+                "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3",
+                "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc",
+                "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f",
+                "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587",
+                "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91",
+                "sha256:6d1c6022b86f83b632d06f2b02774134def5d4d4f1dac8bef16d90cda18ba28a",
+                "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad",
+                "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926",
+                "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9",
+                "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be",
+                "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd",
+                "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96",
+                "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491",
+                "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2",
+                "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a",
+                "sha256:f9062af71c59c004cd519e2fb8f5d25d39e46d3af011b41ab43b9c74e27e236f",
+                "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"
             ],
             "index": "pypi",
-            "version": "==3.2.0"
+            "version": "==23.7.0"
         },
-        "pytest-metadata": {
+        "click": {
             "hashes": [
-                "sha256:769a9c65d2884bd583bc626b0ace77ad15dbe02dd91a9106d47fd46d9c2569ca",
-                "sha256:a17b1e40080401dc23177599208c52228df463db191c1a573ccdffacd885e190"
+                "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
+                "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"
             ],
-            "index": "pypi",
-            "version": "==3.0.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==8.1.7"
         },
-        "requests": {
+        "flake8": {
             "hashes": [
-                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
-                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+                "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23",
+                "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"
             ],
             "index": "pypi",
-            "version": "==2.31.0"
+            "version": "==6.1.0"
         },
-        "urllib3": {
+        "mccabe": {
             "hashes": [
-                "sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1",
-                "sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825"
+                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
+                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==0.7.0"
+        },
+        "mypy-extensions": {
+            "hashes": [
+                "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
+                "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==1.0.0"
+        },
+        "packaging": {
+            "hashes": [
+                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
+                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==2.0.3"
+            "version": "==23.1"
+        },
+        "pathspec": {
+            "hashes": [
+                "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20",
+                "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.11.2"
+        },
+        "platformdirs": {
+            "hashes": [
+                "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d",
+                "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==3.10.0"
+        },
+        "pycodestyle": {
+            "hashes": [
+                "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0",
+                "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==2.11.0"
+        },
+        "pyflakes": {
+            "hashes": [
+                "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774",
+                "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==3.1.0"
         }
-    },
-    "develop": {}
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/SurveyExperimentIntegrationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/SurveyExperimentIntegrationTest.kt
index 277135cb7..18fb39105 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/SurveyExperimentIntegrationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/SurveyExperimentIntegrationTest.kt
@@ -22,7 +22,11 @@ class SurveyExperimentIntegrationTest {
     private val experimentName = "Viewpoint"
 
     @get:Rule
-    val activityTestRule = HomeActivityTestRule()
+    val activityTestRule = HomeActivityTestRule(
+        isJumpBackInCFREnabled = false,
+        isPWAsPromptEnabled = false,
+        isTCPCFREnabled = false,
+    )
 
     @Before
     fun setUp() {
@@ -38,7 +42,25 @@ class SurveyExperimentIntegrationTest {
     fun checkSurveyNavigatesCorrectly() {
         browserScreen {
             verifySurveyButton()
-        }.clickSurveyButton {}
+        }.clickSurveyButton {
+            verifyUrl(surveyURL)
+        }
+
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openExperimentsMenu {
+            verifyExperimentExists(experimentName)
+        }
+    }
+
+    @Test
+    fun checkSurveyNoThanksNavigatesCorrectly() {
+        browserScreen {
+            verifySurveyNoThanksButton()
+        }.clickNoThanksSurveyButton {
+            verifyTabCounter("0")
+        }
 
         homeScreen {
         }.openThreeDotMenu {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/conftest.py b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/conftest.py
index 19ddbf691..27b2f2f1f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/conftest.py
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/conftest.py
@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 from pathlib import Path
 import subprocess
@@ -15,15 +16,32 @@ KLAATU_LOCAL_SERVER_URL = "http://localhost:1378"
 here = Path()
 
 
-def load_branches():
+def pytest_addoption(parser):
+    parser.addoption(
+        "--experiment", action="store", help="The experiments experimenter URL"
+    )
+    parser.addoption(
+        "--stage", action="store_true", default=None, help="Use the stage server"
+    )
+
+
+
+@pytest.fixture(name="load_branches")
+def fixture_load_branches(experiment_url):
     branches = []
-    data = requests.get(f"{KLAATU_SERVER_URL}/experiment").json()
-    for item in reversed(data):
-        if isinstance(item, dict):
+
+    if experiment_url:
+        data = experiment_url
+    else:
+        try:
+            data = requests.get(f"{KLAATU_SERVER_URL}/experiment").json()
+        except ConnectionRefusedError:
+            logging.warn("No URL or experiment slug provided, exiting.")
             exit()
         else:
-            data = item
-            break
+            for item in reversed(data):
+                data = item
+                break
     experiment = requests.get(data).json()
     for item in experiment["branches"]:
         branches.append(item["slug"])
@@ -45,7 +63,6 @@ def gradlewbuild(gradlewbuild_log):
 @pytest.fixture(name="experiment_data")
 def fixture_experiment_data(experiment_url):
     data = requests.get(experiment_url).json()
-    del(data["branches"][0]["features"][0]["value"]["message-under-experiment"])
     for item in data["branches"][0]["features"][0]["value"]["messages"].values():
         for count, trigger in enumerate(item["trigger"]):
             if "USER_EN_SPEAKER" not in trigger:
@@ -54,17 +71,33 @@ def fixture_experiment_data(experiment_url):
 
 
 @pytest.fixture(name="experiment_url", scope="module")
-def fixture_experiment_url():
-    data = requests.get(f"{KLAATU_LOCAL_SERVER_URL}/experiment").json()
+def fixture_experiment_url(request, variables):
     url = None
-    for item in data:
-        if isinstance(item, dict):
-            continue
+
+    if slug := request.config.getoption("--experiment"):
+        # Build URL from slug
+        if request.config.getoption("--stage"):
+            url = f"{variables['urls']['stage_server']}/api/v6/experiments/{slug}"
         else:
-            url = item
+            url = f"{variables['urls']['prod_server']}/api/v6/experiments/{slug}"
+    else:
+        try:
+            data = requests.get(f"{KLAATU_SERVER_URL}/experiment").json()
+        except requests.exceptions.ConnectionError:
+            logging.error("No URL or experiment slug provided, exiting.")
+            exit()
+        else:
+            for item in data:
+                if isinstance(item, dict):
+                    continue
+                else:
+                    url = item
     yield url
     return_data = {"url": url}
-    requests.put(f"{KLAATU_SERVER_URL}/experiment", json=return_data)
+    try:
+        requests.put(f"{KLAATU_SERVER_URL}/experiment", json=return_data)
+    except requests.exceptions.ConnectionError:
+        pass
 
 
 @pytest.fixture(name="json_data")
@@ -116,13 +149,17 @@ def fixture_send_test_results():
 
     with open(f"{here.resolve()}/results/index.html", "rb") as f:
         files = {"file": f}
-        requests.post(f"{KLAATU_SERVER_URL}/test_results", files=files)
+        try:
+            requests.post(f"{KLAATU_SERVER_URL}/test_results", files=files)    
+        except requests.exceptions.ConnectionError:
+            pass
 
 
-@pytest.fixture(name="setup_experiment", params=load_branches(), autouse=True)
-def fixture_setup_experiment(experiment_slug, json_data, gradlewbuild_log, request):
-    def _():
-        command = f"nimbus-cli --app fenix --channel developer enroll {experiment_slug} --branch {request.param} --file {json_data} --reset-app"
+@pytest.fixture(name="setup_experiment")
+def fixture_setup_experiment(experiment_slug, json_data, gradlewbuild_log):
+    def _(branch):
+        logging.info(f"Testing experiment {experiment_slug}, BRANCH: {branch[0]}")
+        command = f"nimbus-cli --app fenix --channel developer enroll {experiment_slug} --branch {branch[0]} --file {json_data} --reset-app"
         try:
             out = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/pytest.ini b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/pytest.ini
index 465cd779e..40a205fb0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/pytest.ini
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
-addopts = --verbose --html=results/index.html --self-contained-html
+addopts = --verbose --html=results/index.html --self-contained-html --variables=variables.yaml
 log_cli = true
 log_cli_level = info
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/test_integration.py b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/test_integration.py
index 63ef8a494..9e88c5df6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/test_integration.py
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/test_integration.py
@@ -1,3 +1,12 @@
-def test_survey_navigates_correctly(setup_experiment, gradlewbuild):
-    setup_experiment()
+import pytest
+
+
+@pytest.mark.parametrize("load_branches", [("branch")], indirect=True)
+def test_survey_navigates_correctly(setup_experiment, gradlewbuild, load_branches):
+    setup_experiment(load_branches)
     gradlewbuild.test("SurveyExperimentIntegrationTest#checkSurveyNavigatesCorrectly")
+
+@pytest.mark.parametrize("load_branches", [("branch")], indirect=True)
+def test_survey_no_thanks_navigates_correctly(setup_experiment, gradlewbuild, load_branches):
+    setup_experiment(load_branches)
+    gradlewbuild.test("SurveyExperimentIntegrationTest#checkSurveyNoThanksNavigatesCorrectly")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/variables.yaml b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/variables.yaml
new file mode 100644
index 000000000..54e26e502
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/experimentintegration/variables.yaml
@@ -0,0 +1,3 @@
+urls:
+  stage_server: "https://stage.experimenter.nonprod.dataops.mozgcp.net"
+  prod_server: "https://experimenter.services.mozilla.com"
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt
index a95fb9216..a42fe1a31 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt
@@ -82,6 +82,11 @@ interface FeatureSettingsHelper {
      */
     var tabsTrayRewriteEnabled: Boolean
 
+    /**
+     * Enable or disable the Top Sites to Compose rewrite.
+     */
+    var composeTopSitesEnabled: Boolean
+
     fun applyFlagUpdates()
 
     fun resetAllFeatureFlags()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt
index cf1828002..c31fcf756 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt
@@ -37,6 +37,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
         isOpenInAppBannerEnabled = settings.shouldShowOpenInAppBanner,
         etpPolicy = getETPPolicy(settings),
         tabsTrayRewriteEnabled = settings.enableTabsTrayToCompose,
+        composeTopSitesEnabled = settings.enableComposeTopSites,
     )
 
     /**
@@ -66,6 +67,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
     override var isOpenInAppBannerEnabled: Boolean by updatedFeatureFlags::isOpenInAppBannerEnabled
     override var etpPolicy: ETPPolicy by updatedFeatureFlags::etpPolicy
     override var tabsTrayRewriteEnabled: Boolean by updatedFeatureFlags::tabsTrayRewriteEnabled
+    override var composeTopSitesEnabled: Boolean by updatedFeatureFlags::composeTopSitesEnabled
 
     override fun applyFlagUpdates() {
         applyFeatureFlags(updatedFeatureFlags)
@@ -91,6 +93,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
         settings.userOptOutOfReEngageCookieBannerDialog = !featureFlags.isCookieBannerReductionDialogEnabled
         settings.shouldShowOpenInAppBanner = featureFlags.isOpenInAppBannerEnabled
         settings.enableTabsTrayToCompose = featureFlags.tabsTrayRewriteEnabled
+        settings.enableComposeTopSites = featureFlags.composeTopSitesEnabled
         setETPPolicy(featureFlags.etpPolicy)
     }
 }
@@ -110,6 +113,7 @@ private data class FeatureFlags(
     var isOpenInAppBannerEnabled: Boolean,
     var etpPolicy: ETPPolicy,
     var tabsTrayRewriteEnabled: Boolean,
+    var composeTopSitesEnabled: Boolean,
 )
 
 internal fun getETPPolicy(settings: Settings): ETPPolicy {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
index dd8b13e14..9243a102f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
@@ -56,6 +56,7 @@ class HomeActivityTestRule(
         isOpenInAppBannerEnabled: Boolean = settings.shouldShowOpenInAppBanner,
         etpPolicy: ETPPolicy = getETPPolicy(settings),
         tabsTrayRewriteEnabled: Boolean = false,
+        composeTopSitesEnabled: Boolean = false,
     ) : this(initialTouchMode, launchActivity, skipOnboarding) {
         this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
         this.isPocketEnabled = isPocketEnabled
@@ -70,6 +71,7 @@ class HomeActivityTestRule(
         this.isOpenInAppBannerEnabled = isOpenInAppBannerEnabled
         this.etpPolicy = etpPolicy
         this.tabsTrayRewriteEnabled = tabsTrayRewriteEnabled
+        this.composeTopSitesEnabled = composeTopSitesEnabled
     }
 
     /**
@@ -114,6 +116,7 @@ class HomeActivityTestRule(
             launchActivity: Boolean = true,
             skipOnboarding: Boolean = false,
             tabsTrayRewriteEnabled: Boolean = false,
+            composeTopSitesEnabled: Boolean = false,
         ) = HomeActivityTestRule(
             initialTouchMode = initialTouchMode,
             launchActivity = launchActivity,
@@ -125,6 +128,7 @@ class HomeActivityTestRule(
             isWallpaperOnboardingEnabled = false,
             isCookieBannerReductionDialogEnabled = false,
             isOpenInAppBannerEnabled = false,
+            composeTopSitesEnabled = composeTopSitesEnabled,
         )
     }
 }
@@ -164,6 +168,7 @@ class HomeActivityIntentTestRule internal constructor(
         isOpenInAppBannerEnabled: Boolean = settings.shouldShowOpenInAppBanner,
         etpPolicy: ETPPolicy = getETPPolicy(settings),
         tabsTrayRewriteEnabled: Boolean = false,
+        composeTopSitesEnabled: Boolean = false,
     ) : this(initialTouchMode, launchActivity, skipOnboarding) {
         this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
         this.isPocketEnabled = isPocketEnabled
@@ -178,6 +183,7 @@ class HomeActivityIntentTestRule internal constructor(
         this.isOpenInAppBannerEnabled = isOpenInAppBannerEnabled
         this.etpPolicy = etpPolicy
         this.tabsTrayRewriteEnabled = tabsTrayRewriteEnabled
+        this.composeTopSitesEnabled = composeTopSitesEnabled
     }
 
     private val longTapUserPreference = getLongPressTimeout()
@@ -259,6 +265,7 @@ class HomeActivityIntentTestRule internal constructor(
             launchActivity: Boolean = true,
             skipOnboarding: Boolean = false,
             tabsTrayRewriteEnabled: Boolean = false,
+            composeTopSitesEnabled: Boolean = false,
         ) = HomeActivityIntentTestRule(
             initialTouchMode = initialTouchMode,
             launchActivity = launchActivity,
@@ -270,6 +277,7 @@ class HomeActivityIntentTestRule internal constructor(
             isWallpaperOnboardingEnabled = false,
             isCookieBannerReductionDialogEnabled = false,
             isOpenInAppBannerEnabled = false,
+            composeTopSitesEnabled = composeTopSitesEnabled,
         )
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt
index 5bbc5f318..9e919a72f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt
@@ -56,7 +56,7 @@ object MockWebServerHelper {
  * If the dispatcher is unable to read a requested asset, it will fail the test by throwing an
  * Exception on the main thread.
  *
- * @sample [org.mozilla.fenix.ui.NavigationToolbarTest.visitURLTest]
+ * @sample [org.mozilla.fenix.ui.BookmarksTest.verifyBookmarkButtonTest]
  */
 const val HTTP_OK = 200
 const val HTTP_NOT_FOUND = 404
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index 92ab6bb5a..af0528849 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -187,9 +187,11 @@ object TestHelper {
         val storageVolume: StorageVolume = storageVolumes[0]
         val file = File(storageVolume.directory!!.path + "/Download/" + fileName)
         try {
-            file.delete()
-            Log.d("TestLog", "File delete try 1")
-            assertFalse("The file was not deleted", file.exists())
+            if (file.exists()) {
+                file.delete()
+                Log.d("TestLog", "File delete try 1")
+                assertFalse("The file was not deleted", file.exists())
+            }
         } catch (e: AssertionError) {
             file.delete()
             Log.d("TestLog", "File delete retried")
diff --git a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
index 318047890..37fe811b5 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
+++ b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/Pipfile.lock
@@ -37,7 +37,7 @@
                 "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082",
                 "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
             ],
-            "index": "pypi",
+            "markers": "python_version >= '3.6'",
             "version": "==2023.7.22"
         },
         "cffi": {
@@ -192,32 +192,32 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711",
-                "sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7",
-                "sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd",
-                "sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e",
-                "sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58",
-                "sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0",
-                "sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d",
-                "sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83",
-                "sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831",
-                "sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766",
-                "sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b",
-                "sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c",
-                "sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182",
-                "sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f",
-                "sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa",
-                "sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4",
-                "sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a",
-                "sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2",
-                "sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76",
-                "sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5",
-                "sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee",
-                "sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f",
-                "sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14"
+                "sha256:0d09fb5356f975974dbcb595ad2d178305e5050656affb7890a1583f5e02a306",
+                "sha256:23c2d778cf829f7d0ae180600b17e9fceea3c2ef8b31a99e3c694cbbf3a24b84",
+                "sha256:3fb248989b6363906827284cd20cca63bb1a757e0a2864d4c1682a985e3dca47",
+                "sha256:41d7aa7cdfded09b3d73a47f429c298e80796c8e825ddfadc84c8a7f12df212d",
+                "sha256:42cb413e01a5d36da9929baa9d70ca90d90b969269e5a12d39c1e0d475010116",
+                "sha256:4c2f0d35703d61002a2bbdcf15548ebb701cfdd83cdc12471d2bae80878a4207",
+                "sha256:4fd871184321100fb400d759ad0cddddf284c4b696568204d281c902fc7b0d81",
+                "sha256:5259cb659aa43005eb55a0e4ff2c825ca111a0da1814202c64d28a985d33b087",
+                "sha256:57a51b89f954f216a81c9d057bf1a24e2f36e764a1ca9a501a6964eb4a6800dd",
+                "sha256:652627a055cb52a84f8c448185922241dd5217443ca194d5739b44612c5e6507",
+                "sha256:67e120e9a577c64fe1f611e53b30b3e69744e5910ff3b6e97e935aeb96005858",
+                "sha256:6af1c6387c531cd364b72c28daa29232162010d952ceb7e5ca8e2827526aceae",
+                "sha256:6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34",
+                "sha256:7efe8041897fe7a50863e51b77789b657a133c75c3b094e51b5e4b5cec7bf906",
+                "sha256:84537453d57f55a50a5b6835622ee405816999a7113267739a1b4581f83535bd",
+                "sha256:8f09daa483aedea50d249ef98ed500569841d6498aa9c9f4b0531b9964658922",
+                "sha256:95dd7f261bb76948b52a5330ba5202b91a26fbac13ad0e9fc8a3ac04752058c7",
+                "sha256:a74fbcdb2a0d46fe00504f571a2a540532f4c188e6ccf26f1f178480117b33c4",
+                "sha256:a983e441a00a9d57a4d7c91b3116a37ae602907a7618b882c8013b5762e80574",
+                "sha256:ab8de0d091acbf778f74286f4989cf3d1528336af1b59f3e5d2ebca8b5fe49e1",
+                "sha256:aeb57c421b34af8f9fe830e1955bf493a86a7996cc1338fe41b30047d16e962c",
+                "sha256:ce785cf81a7bdade534297ef9e490ddff800d956625020ab2ec2780a556c313e",
+                "sha256:d0d651aa754ef58d75cec6edfbd21259d93810b73f6ec246436a21b7841908de"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==41.0.2"
+            "index": "pypi",
+            "version": "==41.0.3"
         },
         "distro": {
             "hashes": [
@@ -229,11 +229,11 @@
         },
         "exceptiongroup": {
             "hashes": [
-                "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5",
-                "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f"
+                "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9",
+                "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"
             ],
             "markers": "python_version < '3.11'",
-            "version": "==1.1.2"
+            "version": "==1.1.3"
         },
         "fxapom": {
             "hashes": [
@@ -373,11 +373,11 @@
         },
         "pluggy": {
             "hashes": [
-                "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849",
-                "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"
+                "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12",
+                "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.2.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.3.0"
         },
         "progressbar2": {
             "hashes": [
@@ -495,19 +495,19 @@
         },
         "selenium": {
             "hashes": [
-                "sha256:40241b9d872f58959e9b34e258488bf11844cd86142fd68182bd41db9991fc5c",
-                "sha256:871bf800c4934f745b909c8dfc7d15c65cf45bd2e943abd54451c810ada395e3"
+                "sha256:95be6aa449a0ab4ac1198bb9de71bbe9170405e04b9752f4b450dc7292a21828",
+                "sha256:b2c48b1440db54a0653300d9955f5421390723d53b36ec835e18de8e13bbd401"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==4.10.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==4.12.0"
         },
         "setuptools": {
             "hashes": [
-                "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f",
-                "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"
+                "sha256:00478ca80aeebeecb2f288d3206b0de568df5cd2b8fada1209843cc9a8d88a48",
+                "sha256:af3d5949030c3f493f550876b2fd1dd5ec66689c4ee5d5344f009746f71fd5a8"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==68.0.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==68.2.0"
         },
         "six": {
             "hashes": [
@@ -557,11 +557,11 @@
         },
         "trio-websocket": {
             "hashes": [
-                "sha256:1a748604ad906a7dcab9a43c6eb5681e37de4793ba0847ef0bc9486933ed027b",
-                "sha256:a9937d48e8132ebf833019efde2a52ca82d223a30a7ea3e8d60a7d28f75a4e3a"
+                "sha256:c7a620c4013c34b7e4477d89fe76695da1e455e4510a8d7ae13f81c632bdce1d",
+                "sha256:e66b3db3e2453017431dfbd352081006654e1241c2a6800dc2f43d7df54d55c5"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==0.10.3"
+            "version": "==0.10.4"
         },
         "typing-extensions": {
             "hashes": [
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddToHomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddToHomeScreenTest.kt
index f1fa8d9b6..4e03051f7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddToHomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddToHomeScreenTest.kt
@@ -4,34 +4,28 @@
 
 package org.mozilla.fenix.ui
 
-import androidx.core.net.toUri
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
+import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.ui.robots.browserScreen
-import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.robots.searchScreen
 
 class AddToHomeScreenTest {
     private lateinit var mockWebServer: MockWebServer
-    private val downloadTestPage =
-        "https://storage.googleapis.com/mobile_test_assets/test_app/downloads.html"
-    private val pdfFileName = "washington.pdf"
-    private val pdfFileURL = "storage.googleapis.com/mobile_test_assets/public/washington.pdf"
-    private val pdfFileContent = "Washington Crossing the Delaware"
 
     @get:Rule
-    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
+    val composeTestRule =
+        AndroidComposeTestRule(HomeActivityTestRule.withDefaultSettingsOverrides()) { it.activity }
 
     @Before
     fun setUp() {
@@ -76,17 +70,15 @@ class AddToHomeScreenTest {
         }
     }
 
+    @Ignore("Failure, more details at: https://bugzilla.mozilla.org/show_bug.cgi?id=1830005")
     @SmokeTest
     @Test
     fun addPrivateBrowsingShortcutTest() {
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
         }.triggerPrivateBrowsingShortcutPrompt {
-            verifyNoThanksPrivateBrowsingShortcutButton()
-            verifyAddPrivateBrowsingShortcutButton()
-            clickAddPrivateBrowsingShortcutButton()
+            verifyNoThanksPrivateBrowsingShortcutButton(composeTestRule)
+            verifyAddPrivateBrowsingShortcutButton(composeTestRule)
+            clickAddPrivateBrowsingShortcutButton(composeTestRule)
             clickAddAutomaticallyButton()
         }.openHomeScreenShortcut("Private ${TestHelper.appName}") {}
         searchScreen {
@@ -95,23 +87,4 @@ class AddToHomeScreenTest {
             verifyCommonMythsLink()
         }
     }
-
-    @SmokeTest
-    @Test
-    fun addPDFToHomeScreenTest() {
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
-            clickPageObject(itemContainingText(pdfFileName))
-            verifyUrl(pdfFileURL)
-            verifyPageContent(pdfFileContent)
-        }.openThreeDotMenu {
-            expandMenu()
-        }.openAddToHomeScreen {
-            verifyShortcutTextFieldTitle(pdfFileName)
-            clickAddShortcutButton()
-            clickAddAutomaticallyButton()
-        }.openHomeScreenShortcut(pdfFileName) {
-            verifyUrl(pdfFileURL)
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
index f326b1abb..b6244395b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@@ -41,6 +41,7 @@ class AddressAutofillTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836845
     @SmokeTest
     @Test
     fun verifyAddressAutofillTest() {
@@ -81,6 +82,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836856
     @SmokeTest
     @Test
     fun deleteSavedAddressTest() {
@@ -111,6 +113,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836840
     @Test
     fun verifyAddAddressViewTest() {
         homeScreen {
@@ -124,6 +127,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836841
     @Test
     fun verifyEditAddressViewTest() {
         homeScreen {
@@ -149,6 +153,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836839
     @Test
     fun verifyAddressAutofillToggleTest() {
         val addressFormPage =
@@ -196,6 +201,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836847
     @Test
     fun verifyManageAddressesPromptOptionTest() {
         val addressFormPage =
@@ -234,9 +240,10 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836849
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1814032")
     @Test
-    fun verifyAddressAutofillSelectionTest() {
+    fun verifyMultipleAddressesSelectionTest() {
         val addressFormPage =
             TestAssetHelper.getAddressFormAsset(mockWebServer)
 
@@ -301,6 +308,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836850
     @Test
     fun verifySavedAddressCanBeEditedTest() {
         homeScreen {
@@ -339,6 +347,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836848
     @Test
     fun verifyStateFieldUpdatesInAccordanceWithCountryFieldTest() {
         homeScreen {
@@ -355,6 +364,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836858
     @Test
     fun verifyFormFieldCanBeFilledManuallyTest() {
         val addressFormPage =
@@ -397,6 +407,7 @@ class AddressAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836838
     @Test
     fun verifyAutofillAddressSectionTest() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index a4c2da8c0..5771bf96d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -27,7 +27,6 @@ import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem
 import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
@@ -81,6 +80,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522919
     @Test
     fun verifyEmptyBookmarksMenuTest() {
         homeScreen {
@@ -93,18 +93,6 @@ class BookmarksTest {
                 verifyAddFolderButton()
                 verifyCloseButton()
                 verifyBookmarkTitle("Desktop Bookmarks")
-            }
-        }
-    }
-
-    @Test
-    fun defaultDesktopBookmarksFoldersTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
                 selectFolder("Desktop Bookmarks")
                 verifyFolderTitle("Bookmarks Menu")
                 verifyFolderTitle("Bookmarks Toolbar")
@@ -116,54 +104,31 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2301370
     @Test
-    fun verifyBookmarkButtonTest() {
+    fun verifyAddBookmarkButtonTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
         }.bookmarkPage {
+            verifySnackBarText("Bookmark saved!")
         }.openThreeDotMenu {
             verifyEditBookmarkButton()
-        }
-    }
-
-    @Test
-    fun addBookmarkTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        browserScreen {
-            createBookmark(defaultWebPage.url)
-        }.openThreeDotMenu {
         }.openBookmarks {
             registerAndCleanupIdlingResources(
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
             ) {
+                verifyBookmarksMenuView()
+                verifyBookmarkTitle(defaultWebPage.title)
                 verifyBookmarkedURL(defaultWebPage.url.toString())
                 verifyBookmarkFavicon(defaultWebPage.url)
             }
         }
     }
 
-    @Test
-    fun createBookmarkFolderTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
-                clickAddFolderButton()
-                verifyKeyboardVisible()
-                addNewFolderName(bookmarksFolderName)
-                saveNewFolder()
-                verifyFolderTitle(bookmarksFolderName)
-                verifyKeyboardHidden()
-            }
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/522920
     @Test
     fun cancelCreateBookmarkFolderTest() {
         homeScreen {
@@ -177,9 +142,9 @@ class BookmarksTest {
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2299619
     @Test
-    fun cancelEditBookmarkTest() {
+    fun cancelingChangesInEditModeAreNotSavedTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -202,9 +167,10 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325633
     @SmokeTest
     @Test
-    fun editBookmarkTest() {
+    fun editBookmarksNameAndUrlTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -229,6 +195,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/341696
     @Test
     fun copyBookmarkURLTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -255,8 +222,9 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325634
     @Test
-    fun threeDotMenuShareBookmarkTest() {
+    fun shareBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -275,6 +243,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325636
     @Test
     fun openBookmarkInNewTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -293,9 +262,10 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1919261
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @Test
-    fun openAllInTabsTest() {
+    fun verifyOpenAllInNewTabsOptionTest() {
         val webPages = listOf(
             TestAssetHelper.getGenericAsset(mockWebServer, 1),
             TestAssetHelper.getGenericAsset(mockWebServer, 2),
@@ -336,9 +306,10 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1919262
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @Test
-    fun openAllInPrivateTabsTest() {
+    fun verifyOpenAllInPrivateTabsTest() {
         val webPages = listOf(
             TestAssetHelper.getGenericAsset(mockWebServer, 1),
             TestAssetHelper.getGenericAsset(mockWebServer, 2),
@@ -372,6 +343,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325637
     @Test
     fun openBookmarkInPrivateTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -390,30 +362,11 @@ class BookmarksTest {
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325635
     @Test
     fun deleteBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-        browserScreen {
-            createBookmark(defaultWebPage.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
-            ) {}
-        }.openThreeDotMenu(defaultWebPage.title) {
-        }.clickDelete {
-            verifyDeleteSnackBarText()
-            verifyUndoDeleteSnackBarButton()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun undoDeleteBookmarkTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
         browserScreen {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
@@ -431,10 +384,13 @@ class BookmarksTest {
             ) {
                 verifyBookmarkedURL(defaultWebPage.url.toString())
             }
+        }.openThreeDotMenu(defaultWebPage.title) {
+        }.clickDelete {
+            verifyBookmarkIsDeleted(defaultWebPage.title)
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2300275
     @Test
     fun bookmarksMultiSelectionToolbarItemsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -460,9 +416,10 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2300276
     @SmokeTest
     @Test
-    fun openSelectionInNewTabTest() {
+    fun openMultipleSelectedBookmarksInANewTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -489,9 +446,9 @@ class BookmarksTest {
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2300277
     @Test
-    fun openSelectionInPrivateTabTest() {
+    fun openMultipleSelectedBookmarksInPrivateTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -513,9 +470,10 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325644
     @SmokeTest
     @Test
-    fun deleteMultipleSelectionTest() {
+    fun deleteMultipleSelectedBookmarksTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
@@ -539,20 +497,9 @@ class BookmarksTest {
 
         bookmarksMenu {
             verifyDeleteMultipleBookmarksSnackBar()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun undoDeleteMultipleSelectionTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        browserScreen {
-            createBookmark(firstWebPage.url)
-            createBookmark(secondWebPage.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
+            clickUndoDeleteButton()
+            verifyBookmarkedURL(firstWebPage.url.toString())
+            verifyBookmarkedURL(secondWebPage.url.toString())
             registerAndCleanupIdlingResources(
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
             ) {
@@ -568,14 +515,12 @@ class BookmarksTest {
 
         bookmarksMenu {
             verifyDeleteMultipleBookmarksSnackBar()
-            clickUndoDeleteButton()
-            verifyBookmarkedURL(firstWebPage.url.toString())
-            verifyBookmarkedURL(secondWebPage.url.toString())
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2301355
     @Test
-    fun multipleSelectionShareButtonTest() {
+    fun shareMultipleSelectedBookmarksTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -598,43 +543,9 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325639
     @Test
-    fun multipleBookmarkDeletionsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            createFolder("1")
-            getInstrumentation().waitForIdleSync()
-            createFolder("2")
-            getInstrumentation().waitForIdleSync()
-            createFolder("3")
-            getInstrumentation().waitForIdleSync()
-        }.openThreeDotMenu("1") {
-        }.clickDelete {
-            verifyDeleteFolderConfirmationMessage()
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-        }.openThreeDotMenu("2") {
-        }.clickDelete {
-            verifyDeleteFolderConfirmationMessage()
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            verifyFolderTitle("3")
-            // On some devices we need to wait for the Snackbar to be gone before continuing
-            TestHelper.waitUntilSnackbarGone()
-        }.closeMenu {
-        }
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyFolderTitle("3")
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun changeBookmarkParentFolderTest() {
+    fun createBookmarkFolderTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -643,13 +554,13 @@ class BookmarksTest {
         }.openBookmarks {
             registerAndCleanupIdlingResources(
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
-            ) {
-                createFolder(bookmarksFolderName)
-            }
+            ) {}
         }.openThreeDotMenu(defaultWebPage.title) {
         }.clickEdit {
             clickParentFolderSelector()
-            selectFolder(bookmarksFolderName)
+            clickAddNewFolderButtonFromSelectFolderView()
+            addNewFolderName(bookmarksFolderName)
+            saveNewFolder()
             navigateUp()
             saveEditBookmark()
             selectFolder(bookmarksFolderName)
@@ -657,6 +568,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325645
     @Test
     fun navigateBookmarksFoldersTest() {
         homeScreen {
@@ -680,8 +592,9 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/374855
     @Test
-    fun cantSelectDesktopFoldersTest() {
+    fun cantSelectDefaultFoldersTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
@@ -694,16 +607,7 @@ class BookmarksTest {
         }
     }
 
-    @Test
-    fun verifyCloseMenuTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-        }.closeMenu {
-            verifyHomeScreen()
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2299703
     @Test
     fun deleteBookmarkInEditModeTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -726,31 +630,7 @@ class BookmarksTest {
         }
     }
 
-    @SmokeTest
-    @Test
-    fun undoDeleteBookmarkFolderTest() {
-        browserScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
-                createFolder("My Folder")
-                verifyFolderTitle("My Folder")
-            }
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            cancelFolderDeletion()
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            clickUndoDeleteButton()
-            verifyFolderTitle("My Folder")
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715710
     @Test
     fun verifySearchBookmarksViewTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -788,6 +668,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715712
     @Test
     fun verifySearchForBookmarkedItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -803,13 +684,13 @@ class BookmarksTest {
             // Search for a valid term
             typeSearch(firstWebPage.title)
             verifySearchEngineSuggestionResults(activityTestRule, firstWebPage.url.toString(), searchTerm = firstWebPage.title)
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
         }.dismissSearchBar {}
         bookmarksMenu {
         }.clickSearchButton {
             // Search for invalid term
             typeSearch("Android")
-            verifyNoSuggestionsAreDisplayed(
+            verifySuggestionsAreNotDisplayed(
                 activityTestRule,
                 firstWebPage.url.toString(),
                 secondWebPage.url.toString(),
@@ -817,6 +698,7 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715711
     @Test
     fun verifyVoiceSearchInBookmarksTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -832,8 +714,9 @@ class BookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715714
     @Test
-    fun verifyDeletedBookmarksCanNotBeSearchedTest() {
+    fun verifyDeletedBookmarksAreNotDisplayedAsSearchResultsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
         val thirdWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3)
@@ -853,8 +736,8 @@ class BookmarksTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             verifySearchEngineSuggestionResults(activityTestRule, thirdWebPage.url.toString(), searchTerm = "generic")
             pressBack()
         }
@@ -865,7 +748,54 @@ class BookmarksTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, thirdWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
+        }
+    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/325642
+    @SmokeTest
+    @Test
+    fun deleteBookmarkFoldersTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        browserScreen {
+            createBookmark(website.url)
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            verifyBookmarkTitle("Test_Page_1")
+            createFolder("My Folder")
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("Test_Page_1") {
+        }.clickEdit {
+            clickParentFolderSelector()
+            selectFolder("My Folder")
+            navigateUp()
+            saveEditBookmark()
+            createFolder("My Folder 2")
+            verifyFolderTitle("My Folder 2")
+        }.openThreeDotMenu("My Folder 2") {
+        }.clickEdit {
+            clickParentFolderSelector()
+            selectFolder("My Folder")
+            navigateUp()
+            saveEditBookmark()
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            cancelFolderDeletion()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            clickUndoDeleteButton()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            verifyBookmarkIsDeleted("My Folder")
+            verifyBookmarkIsDeleted("My Folder 2")
+            verifyBookmarkIsDeleted("Test_Page_1")
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
index ad0572471..fd34537b0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
@@ -15,6 +15,7 @@ import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.ui.robots.browserScreen
@@ -94,6 +95,19 @@ class CollectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2283299
+    @Test
+    fun createFirstCollectionFromMainMenuTest() {
+        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+        }.openSaveToCollection {
+            verifyCollectionNameTextField()
+        }
+    }
+
     @SmokeTest
     @Test
     fun verifyExpandedCollectionItemsTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
index 82bfc6010..e4fe0e4a8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeBookmarksTest.kt
@@ -24,7 +24,6 @@ import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
@@ -91,18 +90,6 @@ class ComposeBookmarksTest {
                 verifyAddFolderButton()
                 verifyCloseButton()
                 verifyBookmarkTitle("Desktop Bookmarks")
-            }
-        }
-    }
-
-    @Test
-    fun defaultDesktopBookmarksFoldersTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
                 selectFolder("Desktop Bookmarks")
                 verifyFolderTitle("Bookmarks Menu")
                 verifyFolderTitle("Bookmarks Toolbar")
@@ -114,54 +101,6 @@ class ComposeBookmarksTest {
         }
     }
 
-    @Test
-    fun verifyBookmarkButtonTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-        }.openThreeDotMenu {
-        }.bookmarkPage {
-        }.openThreeDotMenu {
-            verifyEditBookmarkButton()
-        }
-    }
-
-    @Test
-    fun addBookmarkTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        browserScreen {
-            createBookmark(defaultWebPage.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
-            ) {
-                verifyBookmarkedURL(defaultWebPage.url.toString())
-                verifyBookmarkFavicon(defaultWebPage.url)
-            }
-        }
-    }
-
-    @Test
-    fun createBookmarkFolderTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
-                clickAddFolderButton()
-                verifyKeyboardVisible()
-                addNewFolderName(bookmarksFolderName)
-                saveNewFolder()
-                verifyFolderTitle(bookmarksFolderName)
-                verifyKeyboardHidden()
-            }
-        }
-    }
-
     @Test
     fun cancelCreateBookmarkFolderTest() {
         homeScreen {
@@ -175,9 +114,8 @@ class ComposeBookmarksTest {
         }
     }
 
-    @SmokeTest
     @Test
-    fun cancelEditBookmarkTest() {
+    fun cancelingChangesInEditModeAreNotSavedTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -202,7 +140,7 @@ class ComposeBookmarksTest {
 
     @SmokeTest
     @Test
-    fun editBookmarkTest() {
+    fun editBookmarksNameAndUrlTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -292,7 +230,7 @@ class ComposeBookmarksTest {
     }
 
     @Test
-    fun openAllInTabsTest() {
+    fun verifyOpenAllInNewTabsOptionTest() {
         val webPages = listOf(
             TestAssetHelper.getGenericAsset(mockWebServer, 1),
             TestAssetHelper.getGenericAsset(mockWebServer, 2),
@@ -334,7 +272,7 @@ class ComposeBookmarksTest {
     }
 
     @Test
-    fun openAllInPrivateTabsTest() {
+    fun verifyOpenAllInPrivateTabsTest() {
         val webPages = listOf(
             TestAssetHelper.getGenericAsset(mockWebServer, 1),
             TestAssetHelper.getGenericAsset(mockWebServer, 2),
@@ -386,30 +324,10 @@ class ComposeBookmarksTest {
         }
     }
 
-    @SmokeTest
     @Test
     fun deleteBookmarkTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-        browserScreen {
-            createBookmark(defaultWebPage.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
-            ) {}
-        }.openThreeDotMenu(defaultWebPage.title) {
-        }.clickDelete {
-            verifyDeleteSnackBarText()
-            verifyUndoDeleteSnackBarButton()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun undoDeleteBookmarkTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
         browserScreen {
             createBookmark(defaultWebPage.url)
         }.openThreeDotMenu {
@@ -427,10 +345,12 @@ class ComposeBookmarksTest {
             ) {
                 verifyBookmarkedURL(defaultWebPage.url.toString())
             }
+        }.openThreeDotMenu(defaultWebPage.title) {
+        }.clickDelete {
+            verifyBookmarkIsDeleted(defaultWebPage.title)
         }
     }
 
-    @SmokeTest
     @Test
     fun bookmarksMultiSelectionToolbarItemsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -458,7 +378,7 @@ class ComposeBookmarksTest {
 
     @SmokeTest
     @Test
-    fun openSelectionInNewTabTest() {
+    fun openMultipleSelectedBookmarksInANewTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -486,9 +406,8 @@ class ComposeBookmarksTest {
         }
     }
 
-    @SmokeTest
     @Test
-    fun openSelectionInPrivateTabTest() {
+    fun openMultipleSelectedBookmarksInPrivateTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -512,7 +431,7 @@ class ComposeBookmarksTest {
 
     @SmokeTest
     @Test
-    fun deleteMultipleSelectionTest() {
+    fun deleteMultipleSelectedBookmarksTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
@@ -536,20 +455,9 @@ class ComposeBookmarksTest {
 
         bookmarksMenu {
             verifyDeleteMultipleBookmarksSnackBar()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun undoDeleteMultipleSelectionTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        browserScreen {
-            createBookmark(firstWebPage.url)
-            createBookmark(secondWebPage.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
+            clickUndoDeleteButton()
+            verifyBookmarkedURL(firstWebPage.url.toString())
+            verifyBookmarkedURL(secondWebPage.url.toString())
             registerAndCleanupIdlingResources(
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
             ) {
@@ -565,9 +473,6 @@ class ComposeBookmarksTest {
 
         bookmarksMenu {
             verifyDeleteMultipleBookmarksSnackBar()
-            clickUndoDeleteButton()
-            verifyBookmarkedURL(firstWebPage.url.toString())
-            verifyBookmarkedURL(secondWebPage.url.toString())
         }
     }
 
@@ -596,42 +501,7 @@ class ComposeBookmarksTest {
     }
 
     @Test
-    fun multipleBookmarkDeletionsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            createFolder("1")
-            getInstrumentation().waitForIdleSync()
-            createFolder("2")
-            getInstrumentation().waitForIdleSync()
-            createFolder("3")
-            getInstrumentation().waitForIdleSync()
-        }.openThreeDotMenu("1") {
-        }.clickDelete {
-            verifyDeleteFolderConfirmationMessage()
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-        }.openThreeDotMenu("2") {
-        }.clickDelete {
-            verifyDeleteFolderConfirmationMessage()
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            verifyFolderTitle("3")
-            // On some devices we need to wait for the Snackbar to be gone before continuing
-            TestHelper.waitUntilSnackbarGone()
-        }.closeMenu {
-        }
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyFolderTitle("3")
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun changeBookmarkParentFolderTest() {
+    fun createBookmarkFolderTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         browserScreen {
@@ -640,13 +510,13 @@ class ComposeBookmarksTest {
         }.openBookmarks {
             registerAndCleanupIdlingResources(
                 RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
-            ) {
-                createFolder(bookmarksFolderName)
-            }
+            ) {}
         }.openThreeDotMenu(defaultWebPage.title) {
         }.clickEdit {
             clickParentFolderSelector()
-            selectFolder(bookmarksFolderName)
+            clickAddNewFolderButtonFromSelectFolderView()
+            addNewFolderName(bookmarksFolderName)
+            saveNewFolder()
             navigateUp()
             saveEditBookmark()
             selectFolder(bookmarksFolderName)
@@ -691,16 +561,6 @@ class ComposeBookmarksTest {
         }
     }
 
-    @Test
-    fun verifyCloseMenuTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-        }.closeMenu {
-            verifyHomeScreen()
-        }
-    }
-
     @Test
     fun deleteBookmarkInEditModeTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -723,31 +583,6 @@ class ComposeBookmarksTest {
         }
     }
 
-    @SmokeTest
-    @Test
-    fun undoDeleteBookmarkFolderTest() {
-        browserScreen {
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
-            ) {
-                createFolder("My Folder")
-                verifyFolderTitle("My Folder")
-            }
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            cancelFolderDeletion()
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            clickUndoDeleteButton()
-            verifyFolderTitle("My Folder")
-        }
-    }
-
     @Test
     fun verifySearchBookmarksViewTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -788,6 +623,7 @@ class ComposeBookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715712
     @Test
     fun verifySearchForBookmarkedItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -810,11 +646,11 @@ class ComposeBookmarksTest {
             // Search for a valid term
             typeSearch(firstWebPage.title)
             verifySearchEngineSuggestionResults(activityTestRule, firstWebPage.url.toString(), searchTerm = firstWebPage.title)
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             // Search for invalid term
             typeSearch("Android")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
         }
     }
 
@@ -833,8 +669,9 @@ class ComposeBookmarksTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715714
     @Test
-    fun verifyDeletedBookmarksCanNotBeSearchedTest() {
+    fun verifyDeletedBookmarksAreNotDisplayedAsSearchResultsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
         val thirdWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3)
@@ -854,8 +691,8 @@ class ComposeBookmarksTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             verifySearchEngineSuggestionResults(activityTestRule, thirdWebPage.url.toString(), searchTerm = "generic")
             pressBack()
         }
@@ -866,7 +703,55 @@ class ComposeBookmarksTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, thirdWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
+        }
+    }
+
+    // Verifies that deleting a Bookmarks folder also removes the item from inside it.
+    @SmokeTest
+    @Test
+    fun deleteBookmarkFoldersTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        browserScreen {
+            createBookmark(website.url)
+        }.openThreeDotMenu {
+        }.openBookmarks {
+            verifyBookmarkTitle("Test_Page_1")
+            createFolder("My Folder")
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("Test_Page_1") {
+        }.clickEdit {
+            clickParentFolderSelector()
+            selectFolder("My Folder")
+            navigateUp()
+            saveEditBookmark()
+            createFolder("My Folder 2")
+            verifyFolderTitle("My Folder 2")
+        }.openThreeDotMenu("My Folder 2") {
+        }.clickEdit {
+            clickParentFolderSelector()
+            selectFolder("My Folder")
+            navigateUp()
+            saveEditBookmark()
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            cancelFolderDeletion()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            clickUndoDeleteButton()
+            verifyFolderTitle("My Folder")
+        }.openThreeDotMenu("My Folder") {
+        }.clickDelete {
+            confirmDeletion()
+            verifyDeleteSnackBarText()
+            verifyBookmarkIsDeleted("My Folder")
+            verifyBookmarkIsDeleted("My Folder 2")
+            verifyBookmarkIsDeleted("Test_Page_1")
+            navigateUp()
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
index 83528d0ab..ee18d45fd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt
@@ -15,12 +15,13 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.Constants
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.assertYoutubeAppOpens
+import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
@@ -235,7 +236,7 @@ class ComposeContextMenusTest {
         }
 
         downloadRobot {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.clickOpen("image/jpeg") {} // verify open intent is matched with associated data type
         downloadRobot {
             verifyPhotosAppOpens()
@@ -291,9 +292,10 @@ class ComposeContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            longClickPageObject(itemContainingText("Youtube link"))
+            longClickPageObject(itemContainingText("Youtube full link"))
+            verifyContextMenuForLinksToOtherApps("youtube.com")
             clickContextMenuItem("Open link in external app")
-            assertYoutubeAppOpens()
+            assertExternalAppOpens(Constants.PackageName.YOUTUBE_APP)
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
index 92b1e1d45..7ad95d13e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
@@ -75,7 +75,7 @@ class ComposeHistoryTest {
     }
 
     @Test
-    fun noHistoryItemsInCacheTest() {
+    fun verifyEmptyHistoryMenuTest() {
         homeScreen {
         }.openThreeDotMenu {
             verifyHistoryButton()
@@ -87,8 +87,9 @@ class ComposeHistoryTest {
 
     // Test running on beta/release builds in CI:
     // caution when making changes to it, so they don't block the builds
+    @SmokeTest
     @Test
-    fun visitedUrlHistoryTest() {
+    fun verifyHistoryMenuWithHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -104,6 +105,7 @@ class ComposeHistoryTest {
                 verifyVisitedTimeTitle()
                 verifyFirstTestPageTitle("Test_Page_1")
                 verifyTestPageUrl(firstWebPage.url)
+                verifyDeleteHistoryItemButton("Test_Page_1")
             }
         }
     }
@@ -128,50 +130,6 @@ class ComposeHistoryTest {
         }
     }
 
-    @Test
-    fun undoDeleteHistoryItemTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryListExists()
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1),
-            ) {
-                clickDeleteHistoryButton(firstWebPage.url.toString())
-            }
-            verifyUndoDeleteSnackBarButton()
-            clickUndoDeleteButton()
-            verifyHistoryItemExists(true, firstWebPage.url.toString())
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun cancelDeleteAllHistoryTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryListExists()
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1),
-            ) {
-                clickDeleteAllHistoryButton()
-            }
-            verifyDeleteConfirmationMessage()
-            selectEverythingOption()
-            cancelDeleteHistory()
-            verifyHistoryItemExists(true, firstWebPage.url.toString())
-        }
-    }
-
     @SmokeTest
     @Test
     fun deleteAllHistoryTest() {
@@ -226,7 +184,7 @@ class ComposeHistoryTest {
 
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @Test
-    fun openHistoryInNewTabTest() {
+    fun openMultipleSelectedHistoryItemsInANewTabTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -255,7 +213,7 @@ class ComposeHistoryTest {
     }
 
     @Test
-    fun openHistoryInPrivateTabTest() {
+    fun openMultipleSelectedHistoryItemsInPrivateTabTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -280,7 +238,7 @@ class ComposeHistoryTest {
     }
 
     @Test
-    fun deleteMultipleSelectionTest() {
+    fun deleteMultipleSelectedHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
@@ -314,7 +272,7 @@ class ComposeHistoryTest {
     }
 
     @Test
-    fun shareButtonTest() {
+    fun shareMultipleSelectedHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -409,12 +367,12 @@ class ComposeHistoryTest {
             // Search for a valid term
             typeSearch(firstWebPage.title)
             verifySearchEngineSuggestionResults(activityTestRule, firstWebPage.url.toString(), searchTerm = firstWebPage.title)
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             clickClearButton()
             // Search for invalid term
             typeSearch("Android")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
         }
     }
 
@@ -445,8 +403,8 @@ class ComposeHistoryTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             verifySearchEngineSuggestionResults(activityTestRule, thirdWebPage.url.toString(), searchTerm = "generic")
             pressBack()
         }
@@ -456,7 +414,7 @@ class ComposeHistoryTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, thirdWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt
index 5a620ea0c..f9e350dcc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt
@@ -63,7 +63,6 @@ class ComposeHomeScreenTest {
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580")
     @Test
     fun homeScreenItemsTest() {
-        homeScreen {}.dismissOnboarding()
         homeScreen {
             verifyHomeWordmark()
             verifyHomePrivateBrowsingButton()
@@ -86,7 +85,6 @@ class ComposeHomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199
     @Test
     fun privateBrowsingHomeScreenItemsTest() {
-        homeScreen { }.dismissOnboarding()
         homeScreen { }.togglePrivateBrowsingMode()
 
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeNavigationToolbarTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeNavigationToolbarTest.kt
index 6a1644c1e..35a912596 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeNavigationToolbarTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeNavigationToolbarTest.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.core.net.toUri
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
@@ -16,11 +15,8 @@ import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.runWithSystemLocaleChanged
-import org.mozilla.fenix.ui.robots.clickPageObject
-import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import java.util.Locale
 
@@ -60,51 +56,6 @@ class ComposeNavigationToolbarTest {
         mockWebServer.shutdown()
     }
 
-    @Test
-    fun goBackTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(nextWebPage.url) {
-            verifyUrl(nextWebPage.url.toString())
-        }.openThreeDotMenu {
-        }.goToPreviousPage {
-            mDevice.waitForIdle()
-            verifyUrl(defaultWebPage.url.toString())
-        }
-    }
-
-    @Test
-    fun goForwardTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(nextWebPage.url) {
-            mDevice.waitForIdle()
-            verifyUrl(nextWebPage.url.toString())
-        }.openThreeDotMenu {
-        }.goToPreviousPage {
-            mDevice.waitForIdle()
-            verifyUrl(defaultWebPage.url.toString())
-        }
-
-        // Re-open the three-dot menu for verification
-        navigationToolbar {
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-        }.goForward {
-            verifyUrl(nextWebPage.url.toString())
-        }
-    }
-
     // Swipes the nav bar left/right to switch between tabs
     @SmokeTest
     @Test
@@ -144,126 +95,4 @@ class ComposeNavigationToolbarTest {
             }
         }
     }
-
-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun visitURLTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            verifyUrl(defaultWebPage.url.toString())
-        }
-    }
-
-    @Test
-    fun findInPageTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-            verifyFindInPageButton()
-        }.openFindInPage {
-            verifyFindInPageNextButton()
-            verifyFindInPagePrevButton()
-            verifyFindInPageCloseButton()
-            enterFindInPageQuery("a")
-            verifyFindNextInPageResult("1/3")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/3")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("3/3")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("2/3")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/3")
-        }.closeFindInPageWithCloseButton {
-            verifyFindInPageBar(false)
-        }.openThreeDotMenu {
-        }.openFindInPage {
-            enterFindInPageQuery("3")
-            verifyFindNextInPageResult("1/1")
-        }.closeFindInPageWithBackButton {
-            verifyFindInPageBar(false)
-        }
-    }
-
-    @Test
-    fun pdfFindInPageTest() {
-        val genericURL =
-            TestAssetHelper.getGenericAsset(mockWebServer, 3)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            clickPageObject(itemWithText("PDF form file"))
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-            verifyFindInPageButton()
-        }.openFindInPage {
-            verifyFindInPageNextButton()
-            verifyFindInPagePrevButton()
-            verifyFindInPageCloseButton()
-            enterFindInPageQuery("l")
-            verifyFindNextInPageResult("1/2")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/2")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/2")
-        }.closeFindInPageWithCloseButton {
-            verifyFindInPageBar(false)
-        }.openThreeDotMenu {
-        }.openFindInPage {
-            enterFindInPageQuery("p")
-            verifyFindNextInPageResult("1/1")
-        }.closeFindInPageWithBackButton {
-            verifyFindInPageBar(false)
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun verifySecurePageSecuritySubMenuTest() {
-        val defaultWebPage = "https://mozilla-mobile.github.io/testapp/loginForm"
-        val defaultWebPageTitle = "Login_form"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.toUri()) {
-        }.openSiteSecuritySheet {
-            verifyQuickActionSheet(defaultWebPage, true)
-            openSecureConnectionSubMenu(true)
-            verifySecureConnectionSubMenu(defaultWebPageTitle, defaultWebPage, true)
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun verifyInsecurePageSecuritySubMenuTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            waitForPageToLoad()
-        }.openSiteSecuritySheet {
-            verifyQuickActionSheet(defaultWebPage.url.toString(), false)
-            openSecureConnectionSubMenu(false)
-            verifySecureConnectionSubMenu(defaultWebPage.title, defaultWebPage.url.toString(), false)
-        }
-    }
-
-    @Test
-    fun verifyClearCookiesFromQuickSettingsTest() {
-        val helpPageUrl = "mozilla.org"
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openHelp {
-        }.openSiteSecuritySheet {
-            clickQuickActionSheetClearSiteData()
-            verifyClearSiteDataPrompt(helpPageUrl)
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
index 387380fcd..0a4ceaafa 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSearchTest.kt
@@ -666,7 +666,7 @@ class ComposeSearchTest {
             clickSearchSelectorButton()
             selectTemporarySearchMethod(searchEngineName = "Tabs")
             typeSearch(searchTerm = "Mozilla")
-            verifyNoSuggestionsAreDisplayed(rule = activityTestRule, "Mozilla")
+            verifySuggestionsAreNotDisplayed(rule = activityTestRule, "Mozilla")
             clickClearButton()
             verifySearchBarPlaceholder("Search tabs")
         }
@@ -686,7 +686,7 @@ class ComposeSearchTest {
             clickSearchSelectorButton()
             selectTemporarySearchMethod(searchEngineName = "Tabs")
             typeSearch(searchTerm = "Mozilla")
-            verifyNoSuggestionsAreDisplayed(rule = activityTestRule, "Mozilla")
+            verifySuggestionsAreNotDisplayed(rule = activityTestRule, "Mozilla")
             clickClearButton()
             typeSearch(searchTerm = "generic")
             verifyTypedToolbarText("generic")
@@ -725,7 +725,7 @@ class ComposeSearchTest {
         }.clickSearchSelectorButton {
             selectTemporarySearchMethod("Bookmarks")
             typeSearch("test")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, "test")
+            verifySuggestionsAreNotDisplayed(activityTestRule, "test")
         }
     }
 
@@ -752,7 +752,7 @@ class ComposeSearchTest {
         }.dismissSearchBar {
         }.openSearch {
             typeSearch("mozilla ")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, "Test1", "Test2")
+            verifySuggestionsAreNotDisplayed(activityTestRule, "Test1", "Test2")
         }
     }
 
@@ -776,7 +776,7 @@ class ComposeSearchTest {
             clickSearchSelectorButton()
             selectTemporarySearchMethod(searchEngineName = "History")
             typeSearch(searchTerm = "Mozilla")
-            verifyNoSuggestionsAreDisplayed(rule = activityTestRule, "Mozilla")
+            verifySuggestionsAreNotDisplayed(rule = activityTestRule, "Mozilla")
             clickClearButton()
             verifySearchBarPlaceholder("Search history")
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt
index 57ce9115a..4ed0adadb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt
@@ -68,7 +68,7 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest {
     }
 
     @Test
-    fun deleteBrowsingDataOnQuitSettingsItemsTest() {
+    fun deleteBrowsingDataOnQuitSettingTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -120,7 +120,7 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest {
     }
 
     @Test
-    fun deleteHistoryOnQuitTest() {
+    fun deleteBrowsingHistoryOnQuitTest() {
         val genericPage =
             getStorageTestAsset(mockWebServer, "generic1.html")
 
@@ -147,6 +147,7 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416051
     @Test
     fun deleteCookiesAndSiteDataOnQuitTest() {
         val storageWritePage =
@@ -198,7 +199,7 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest {
         }.clickDownloadLink("smallZip.zip") {
             verifyDownloadPrompt("smallZip.zip")
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.closeCompletedDownloadPrompt {
         }.goToHomescreen {
         }.openThreeDotMenu {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt
index 78f777eaf..7b092bbb5 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt
@@ -117,7 +117,7 @@ class ComposeSettingsDeleteBrowsingDataTest {
     }
 
     @Test
-    fun deleteTabsDataWithNoOpenTabsTest() {
+    fun deleteOpenTabsBrowsingDataWithNoOpenTabsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -135,7 +135,7 @@ class ComposeSettingsDeleteBrowsingDataTest {
 
     @SmokeTest
     @Test
-    fun deleteTabsDataTest() {
+    fun deleteOpenTabsBrowsingDataTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
index 8adf0f1c2..d4a9cbcc9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
@@ -1,384 +1,238 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@file:Suppress("DEPRECATION")
-
-package org.mozilla.fenix.ui
-
-import android.view.View
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.engine.mediasession.MediaSession
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.mozilla.fenix.IntentReceiverActivity
-import org.mozilla.fenix.R
-import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
-import org.mozilla.fenix.helpers.RetryTestRule
-import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.assertYoutubeAppOpens
-import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
-import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
-import org.mozilla.fenix.ui.robots.browserScreen
-import org.mozilla.fenix.ui.robots.clickPageObject
-import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.navigationToolbar
-
-/**
- * Test Suite that contains a part of the Smoke and Sanity tests defined in TestRail:
- * https://testrail.stage.mozaws.net/index.php?/suites/view/3192
- * Other smoke tests have been marked with the @SmokeTest annotation throughout the ui package in order to limit this class expansion.
- * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
- */
-@Suppress("ForbiddenComment")
-@SmokeTest
-class ComposeSmokeTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
-    private val customMenuItem = "TestMenuItem"
-    private lateinit var browserStore: BrowserStore
-
-    @get:Rule(order = 0)
-    val activityTestRule = AndroidComposeTestRule(
-        HomeActivityIntentTestRule.withDefaultSettingsOverrides(
-            tabsTrayRewriteEnabled = true,
-        ),
-    ) { it.activity }
-
-    @get: Rule(order = 1)
-    val intentReceiverActivityTestRule = ActivityTestRule(
-        IntentReceiverActivity::class.java,
-        true,
-        false,
-    )
-
-    @Rule(order = 2)
-    @JvmField
-    val retryTestRule = RetryTestRule(3)
-
-    @Before
-    fun setUp() {
-        // Initializing this as part of class construction, below the rule would throw a NPE
-        // So we are initializing this here instead of in all related tests.
-        browserStore = activityTestRule.activity.components.core.store
-
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
-    // Device or AVD requires a Google Services Android OS installation with Play Store installed
-    // Verifies the Open in app button when an app is installed
-    @Test
-    fun mainMenuOpenInAppTest() {
-        val youtubeURL = "vnd.youtube://".toUri()
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(youtubeURL) {
-            verifyNotificationDotOnMainMenu()
-        }.openThreeDotMenu {
-        }.clickOpenInApp {
-            assertYoutubeAppOpens()
-        }
-    }
-
-    // Verifies that deleting a Bookmarks folder also removes the item from inside it.
-    @Test
-    fun deleteNonEmptyBookmarkFolderTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        browserScreen {
-            createBookmark(website.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyBookmarkTitle("Test_Page_1")
-            createFolder("My Folder")
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("Test_Page_1") {
-        }.clickEdit {
-            clickParentFolderSelector()
-            selectFolder("My Folder")
-            navigateUp()
-            saveEditBookmark()
-            createFolder("My Folder 2")
-            verifyFolderTitle("My Folder 2")
-        }.openThreeDotMenu("My Folder 2") {
-        }.clickEdit {
-            clickParentFolderSelector()
-            selectFolder("My Folder")
-            navigateUp()
-            saveEditBookmark()
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            cancelFolderDeletion()
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            verifyBookmarkIsDeleted("My Folder")
-            verifyBookmarkIsDeleted("My Folder 2")
-            verifyBookmarkIsDeleted("Test_Page_1")
-            navigateUp()
-        }
-
-        browserScreen {
-        }.openThreeDotMenu {
-            verifyAddBookmarkButton()
-        }
-    }
-
-    @Test
-    fun shareTabsFromTabsTrayTest() {
-        val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-        val firstWebsiteTitle = firstWebsite.title
-        val secondWebsiteTitle = secondWebsite.title
-        val sharingApp = "Gmail"
-        val sharedUrlsString = "${firstWebsite.url}\n\n${secondWebsite.url}"
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebsite.url) {
-            verifyPageContent(firstWebsite.content)
-        }.openComposeTabDrawer(activityTestRule) {
-        }.openNewTab {
-        }.submitQuery(secondWebsite.url.toString()) {
-            verifyPageContent(secondWebsite.content)
-        }.openComposeTabDrawer(activityTestRule) {
-            verifyExistingOpenTabs("Test_Page_1")
-            verifyExistingOpenTabs("Test_Page_2")
-        }.openThreeDotMenu {
-            verifyShareAllTabsButton()
-        }.clickShareAllTabsButton {
-            verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle)
-            verifySharingWithSelectedApp(
-                sharingApp,
-                sharedUrlsString,
-                "$firstWebsiteTitle, $secondWebsiteTitle",
-            )
-        }
-    }
-
-    @Test
-    fun privateTabsTrayWithOpenedTabTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-        }.openComposeTabDrawer(activityTestRule) {
-            verifyNormalBrowsingButtonIsSelected(false)
-            verifyPrivateBrowsingButtonIsSelected(true)
-            verifySyncedTabsButtonIsSelected(false)
-            verifyThreeDotButton()
-            verifyNormalTabCounter()
-            verifyPrivateTabsList()
-            verifyExistingOpenTabs(website.title)
-            verifyTabCloseButton()
-            verifyTabThumbnail()
-            verifyFab()
-        }
-    }
-
-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun noHistoryInPrivateBrowsingTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyEmptyHistoryView()
-        }
-    }
-
-    @Test
-    fun mainMenuInstallPWATest() {
-        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(pwaPage.toUri()) {
-            verifyNotificationDotOnMainMenu()
-        }.openThreeDotMenu {
-        }.clickInstall {
-            clickAddAutomaticallyButton()
-        }.openHomeScreenShortcut("TEST_APP") {
-            mDevice.waitForIdle()
-            verifyNavURLBarHidden()
-        }
-    }
-
-    // Verifies that reader mode is detected and the custom appearance controls are displayed
-    @Test
-    fun verifyReaderViewAppearanceUI() {
-        val readerViewPage =
-            TestAssetHelper.getLoremIpsumAsset(mockWebServer)
-        val estimatedReadingTime = "1 - 2 minutes"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(readerViewPage.url) {
-            mDevice.waitForIdle()
-        }
-
-        registerAndCleanupIdlingResources(
-            ViewVisibilityIdlingResource(
-                activityTestRule.activity.findViewById(R.id.mozac_browser_toolbar_page_actions),
-                View.VISIBLE,
-            ),
-        ) {}
-
-        navigationToolbar {
-            verifyReaderViewDetected(true)
-            toggleReaderView()
-        }
-
-        browserScreen {
-            waitForPageToLoad()
-            verifyPageContent(estimatedReadingTime)
-        }.openThreeDotMenu {
-            verifyReaderViewAppearance(true)
-        }.openReaderViewAppearance {
-            verifyAppearanceFontGroup(true)
-            verifyAppearanceFontSansSerif(true)
-            verifyAppearanceFontSerif(true)
-            verifyAppearanceFontIncrease(true)
-            verifyAppearanceFontDecrease(true)
-            verifyAppearanceColorGroup(true)
-            verifyAppearanceColorDark(true)
-            verifyAppearanceColorLight(true)
-            verifyAppearanceColorSepia(true)
-        }
-    }
-
-    @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1846941")
-    @Test
-    fun tabMediaControlButtonTest() {
-        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(audioTestPage.url) {
-            mDevice.waitForIdle()
-            clickPageObject(itemWithText("Play"))
-            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
-        }.openComposeTabDrawer(activityTestRule) {
-            verifyTabMediaControlButtonState("Pause")
-            clickTabMediaControlButton("Pause")
-            verifyTabMediaControlButtonState("Play")
-        }.openTab(audioTestPage.title) {
-            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
-        }
-    }
-
-    // For API>23
-    // Verifies the default browser switch opens the system default apps menu.
-    @Test
-    fun changeDefaultBrowserSetting() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyDefaultBrowserToggle(false)
-            clickDefaultBrowserSwitch()
-            verifyAndroidDefaultAppsMenuAppears()
-        }
-        // Dismiss the request
-        mDevice.pressBack()
-    }
-
-    @Test
-    fun goToHomeScreenBottomToolbarTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenTopToolbarTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCustomizeSubMenu {
-            clickTopToolbarToggle()
-        }.goBack {
-        }.goBack {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenBottomToolbarPrivateModeTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-            togglePrivateBrowsingModeOnOff()
-        }
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenTopToolbarPrivateModeTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-            togglePrivateBrowsingModeOnOff()
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCustomizeSubMenu {
-            clickTopToolbarToggle()
-        }.goBack {
-        }.goBack {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-}
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@file:Suppress("DEPRECATION")
+
+package org.mozilla.fenix.ui
+
+import android.view.View
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.core.net.toUri
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.IntentReceiverActivity
+import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
+import org.mozilla.fenix.helpers.RetryTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
+import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.clickPageObject
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+/**
+ * Test Suite that contains a part of the Smoke and Sanity tests defined in TestRail:
+ * https://testrail.stage.mozaws.net/index.php?/suites/view/3192
+ * Other smoke tests have been marked with the @SmokeTest annotation throughout the ui package in order to limit this class expansion.
+ * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
+ */
+@Suppress("ForbiddenComment")
+@SmokeTest
+class ComposeSmokeTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+    private val customMenuItem = "TestMenuItem"
+    private lateinit var browserStore: BrowserStore
+
+    @get:Rule(order = 0)
+    val activityTestRule = AndroidComposeTestRule(
+        HomeActivityIntentTestRule.withDefaultSettingsOverrides(
+            tabsTrayRewriteEnabled = true,
+        ),
+    ) { it.activity }
+
+    @get: Rule(order = 1)
+    val intentReceiverActivityTestRule = ActivityTestRule(
+        IntentReceiverActivity::class.java,
+        true,
+        false,
+    )
+
+    @Rule(order = 2)
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
+
+    @Before
+    fun setUp() {
+        // Initializing this as part of class construction, below the rule would throw a NPE
+        // So we are initializing this here instead of in all related tests.
+        browserStore = activityTestRule.activity.components.core.store
+
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @Test
+    fun shareTabsFromTabsTrayTest() {
+        val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2)
+        val firstWebsiteTitle = firstWebsite.title
+        val secondWebsiteTitle = secondWebsite.title
+        val sharingApp = "Gmail"
+        val sharedUrlsString = "${firstWebsite.url}\n\n${secondWebsite.url}"
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebsite.url) {
+            verifyPageContent(firstWebsite.content)
+        }.openComposeTabDrawer(activityTestRule) {
+        }.openNewTab {
+        }.submitQuery(secondWebsite.url.toString()) {
+            verifyPageContent(secondWebsite.content)
+        }.openComposeTabDrawer(activityTestRule) {
+            verifyExistingOpenTabs("Test_Page_1")
+            verifyExistingOpenTabs("Test_Page_2")
+        }.openThreeDotMenu {
+            verifyShareAllTabsButton()
+        }.clickShareAllTabsButton {
+            verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle)
+            verifySharingWithSelectedApp(
+                sharingApp,
+                sharedUrlsString,
+                "$firstWebsiteTitle, $secondWebsiteTitle",
+            )
+        }
+    }
+
+    @Test
+    fun privateTabsTrayWithOpenedTabTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+        }.openComposeTabDrawer(activityTestRule) {
+            verifyNormalBrowsingButtonIsSelected(false)
+            verifyPrivateBrowsingButtonIsSelected(true)
+            verifySyncedTabsButtonIsSelected(false)
+            verifyThreeDotButton()
+            verifyNormalTabCounter()
+            verifyPrivateTabsList()
+            verifyExistingOpenTabs(website.title)
+            verifyTabCloseButton()
+            verifyTabThumbnail()
+            verifyFab()
+        }
+    }
+
+    // Test running on beta/release builds in CI:
+    // caution when making changes to it, so they don't block the builds
+    @Test
+    fun noHistoryInPrivateBrowsingTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+            mDevice.waitForIdle()
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyEmptyHistoryView()
+        }
+    }
+
+    @Test
+    fun mainMenuInstallPWATest() {
+        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(pwaPage.toUri()) {
+            verifyNotificationDotOnMainMenu()
+        }.openThreeDotMenu {
+        }.clickInstall {
+            clickAddAutomaticallyButton()
+        }.openHomeScreenShortcut("TEST_APP") {
+            mDevice.waitForIdle()
+            verifyNavURLBarHidden()
+        }
+    }
+
+    // Verifies that reader mode is detected and the custom appearance controls are displayed
+    @Test
+    fun verifyReaderViewAppearanceUI() {
+        val readerViewPage =
+            TestAssetHelper.getLoremIpsumAsset(mockWebServer)
+        val estimatedReadingTime = "1 - 2 minutes"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(readerViewPage.url) {
+            mDevice.waitForIdle()
+        }
+
+        registerAndCleanupIdlingResources(
+            ViewVisibilityIdlingResource(
+                activityTestRule.activity.findViewById(R.id.mozac_browser_toolbar_page_actions),
+                View.VISIBLE,
+            ),
+        ) {}
+
+        navigationToolbar {
+            verifyReaderViewDetected(true)
+            toggleReaderView()
+        }
+
+        browserScreen {
+            waitForPageToLoad()
+            verifyPageContent(estimatedReadingTime)
+        }.openThreeDotMenu {
+            verifyReaderViewAppearance(true)
+        }.openReaderViewAppearance {
+            verifyAppearanceFontGroup(true)
+            verifyAppearanceFontSansSerif(true)
+            verifyAppearanceFontSerif(true)
+            verifyAppearanceFontIncrease(true)
+            verifyAppearanceFontDecrease(true)
+            verifyAppearanceColorGroup(true)
+            verifyAppearanceColorDark(true)
+            verifyAppearanceColorLight(true)
+            verifyAppearanceColorSepia(true)
+        }
+    }
+
+    @Test
+    fun tabMediaControlButtonTest() {
+        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(audioTestPage.url) {
+            mDevice.waitForIdle()
+            clickPageObject(itemWithText("Play"))
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
+        }.openComposeTabDrawer(activityTestRule) {
+            verifyTabMediaControlButtonState("Pause")
+            clickTabMediaControlButton("Pause")
+            verifyTabMediaControlButtonState("Play")
+        }.openTab(audioTestPage.title) {
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
new file mode 100644
index 000000000..5b953f930
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt
@@ -0,0 +1,256 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.ui
+
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
+import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
+import org.mozilla.fenix.helpers.TestHelper.generateRandomString
+import org.mozilla.fenix.helpers.TestHelper.getStringResource
+import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.homeScreenWithComposeTopSites
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+/**
+ * Tests Top Sites functionality
+ *
+ * - Verifies 'Add to Firefox Home' UI functionality
+ * - Verifies 'Top Sites' context menu UI functionality
+ * - Verifies 'Top Site' usage UI functionality
+ * - Verifies existence of default top sites available on the home-screen
+ */
+
+class ComposeTopSitesTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+
+    @get:Rule
+    val composeTestRule =
+        AndroidComposeTestRule(
+            HomeActivityTestRule.withDefaultSettingsOverrides(
+                composeTopSitesEnabled = true,
+            ),
+        ) { it.activity }
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @SmokeTest
+    @Test
+    fun verifyAddToFirefoxHome() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }
+    }
+
+    @Test
+    fun verifyOpenTopSiteNormalTab() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openTopSiteTabWithTitle(title = defaultWebPage.title) {
+            verifyUrl(defaultWebPage.url.toString().replace("http://", ""))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+            verifyTopSiteContextMenuItems()
+        }
+
+        // Dismiss context menu popup
+        mDevice.pressBack()
+    }
+
+    @Test
+    fun verifyOpenTopSitePrivateTab() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+            verifyTopSiteContextMenuItems()
+        }.openTopSiteInPrivate() {
+            verifyCurrentPrivateSession(composeTestRule.activity.applicationContext)
+        }
+    }
+
+    @Test
+    fun verifyRenameTopSite() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+        val newPageTitle = generateRandomString(5)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            waitForPageToLoad()
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+            verifyTopSiteContextMenuItems()
+        }.renameTopSite(newPageTitle) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(newPageTitle)
+        }
+    }
+
+    @Test
+    fun verifyRemoveTopSite() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+            verifyTopSiteContextMenuItems()
+        }.removeTopSite {
+            verifyNotExistingTopSiteItem(defaultWebPage.title)
+        }
+    }
+
+    @Test
+    fun verifyUndoRemoveTopSite() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+            verifyTopSiteContextMenuItems()
+        }.removeTopSite {
+            clickSnackbarButton("UNDO")
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }
+    }
+
+    @Test
+    fun verifyRemoveTopSiteFromMainMenu() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+            verifyAddToShortcutsButton(true)
+        }.addToFirefoxHome {
+            verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openTopSiteTabWithTitle(defaultWebPage.title) {
+        }.openThreeDotMenu {
+            verifyRemoveFromShortcutsButton()
+        }.clickRemoveFromShortcuts {
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyNotExistingTopSiteItem(defaultWebPage.title)
+        }
+    }
+
+    // Expected for en-us defaults
+    @Test
+    fun verifyDefaultTopSitesList() {
+        homeScreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            val topSitesTitles = arrayListOf("Google", "Top Articles", "Wikipedia")
+            topSitesTitles.forEach { value ->
+                verifyExistingTopSiteItem(value)
+            }
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun addAndRemoveMostViewedTopSiteTest() {
+        val defaultWebPage = getGenericAsset(mockWebServer, 1)
+
+        for (i in 0..1) {
+            navigationToolbar {
+            }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+                waitForPageToLoad()
+            }
+        }
+
+        browserScreen {
+        }.goToHomescreenWithComposeTopSites(composeTestRule) {
+            verifyExistingTopSitesList()
+            verifyExistingTopSiteItem(defaultWebPage.title)
+        }.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
+        }.deleteTopSiteFromHistory {
+            verifySnackBarText(getStringResource(R.string.snackbar_top_site_removed))
+            waitUntilSnackbarGone()
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyEmptyHistoryView()
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index 7cdfe00e1..edc4b5d48 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -15,12 +15,13 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.Constants.PackageName.YOUTUBE_APP
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.assertYoutubeAppOpens
+import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.ui.robots.clickContextMenuItem
 import org.mozilla.fenix.ui.robots.clickPageObject
@@ -231,7 +232,7 @@ class ContextMenusTest {
         }
 
         downloadRobot {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.clickOpen("image/jpeg") {} // verify open intent is matched with associated data type
         downloadRobot {
             verifyPhotosAppOpens()
@@ -287,10 +288,10 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            longClickPageObject(itemContainingText("Youtube link"))
-            verifyContextMenuForLinksToOtherApps("youtube.com".toUri())
+            longClickPageObject(itemContainingText("Youtube full link"))
+            verifyContextMenuForLinksToOtherApps("youtube.com")
             clickContextMenuItem("Open link in external app")
-            assertYoutubeAppOpens()
+            assertExternalAppOpens(YOUTUBE_APP)
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerReductionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerReductionTest.kt
index 5dbf3e417..72176cea7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerReductionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CookieBannerReductionTest.kt
@@ -14,17 +14,17 @@ import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.navigationToolbar
 
 class CookieBannerReductionTest {
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1980504
     // Bug causing flakiness https://bugzilla.mozilla.org/show_bug.cgi?id=1807440
     @Ignore("Disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1852803")
     @SmokeTest
     @Test
-    fun verifyCookieBannerReductionTest() {
+    fun verifyCookieBannerReductionFunctionalityTest() {
         val webSite = "startsiden.no"
 
         homeScreen {
@@ -69,55 +69,4 @@ class CookieBannerReductionTest {
             verifyCookieBannerExists(exists = false)
         }
     }
-
-    // Bug causing flakiness https://bugzilla.mozilla.org/show_bug.cgi?id=1807440
-    @SmokeTest
-    @Test
-    fun verifyCookieBannerReductionInPrivateBrowsingTest() {
-        val webSite = "startsiden.no"
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(webSite.toUri()) {
-            waitForPageToLoad()
-            verifyCookieBannerExists(exists = true)
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsOptionSummary("Cookie banner reduction", "Off")
-        }.openCookieBannerReductionSubMenu {
-            verifyCookieBannerView(isCookieBannerReductionChecked = false)
-            clickCookieBannerReductionToggle()
-            verifyCheckedCookieBannerReductionToggle(isCookieBannerReductionChecked = true)
-        }.goBack {
-            verifySettingsOptionSummary("Cookie banner reduction", "On")
-        }
-
-        exitMenu()
-
-        browserScreen {
-            verifyCookieBannerExists(exists = false)
-        }
-
-        restartApp(activityTestRule)
-
-        homeScreen {
-        }.openTabDrawer {
-        }.openTab("Startsiden.no") {
-            verifyCookieBannerExists(exists = false)
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCookieBannerReductionSubMenu {
-            clickCookieBannerReductionToggle()
-            verifyCheckedCookieBannerReductionToggle(false)
-            exitMenu()
-        }
-        browserScreen {
-            waitForPageToLoad()
-        }.openThreeDotMenu {
-        }.refreshPage {
-            verifyCookieBannerExists(exists = false)
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
index 46c8557eb..0afcf7d06 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
@@ -62,6 +62,7 @@ class CreditCardAutofillTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512792
     @SmokeTest
     @Test
     fun verifyCreditCardAutofillTest() {
@@ -99,32 +100,10 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512798
     @SmokeTest
     @Test
     fun deleteSavedCreditCardUsingToolbarButtonTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            clickSavedCreditCard()
-            clickDeleteCreditCardToolbarButton()
-            clickConfirmDeleteCreditCardButton()
-            verifyAddCreditCardsButton()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun cancelDeleteSavedCreditCardUsingToolbarButtonTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -142,35 +121,16 @@ class CreditCardAutofillTest {
             clickDeleteCreditCardToolbarButton()
             clickCancelDeleteCreditCardButton()
             verifyEditCreditCardToolbarTitle()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun deleteSavedCreditCardUsingMenuButtonTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            clickSavedCreditCard()
-            clickDeleteCreditCardMenuButton()
+            clickDeleteCreditCardToolbarButton()
             clickConfirmDeleteCreditCardButton()
             verifyAddCreditCardsButton()
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271192
     @SmokeTest
     @Test
-    fun cancelDeleteSavedCreditCardUsingMenuButtonTest() {
+    fun deleteSavedCreditCardUsingMenuButtonTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -188,9 +148,13 @@ class CreditCardAutofillTest {
             clickDeleteCreditCardMenuButton()
             clickCancelDeleteCreditCardButton()
             verifyEditCreditCardToolbarTitle()
+            clickDeleteCreditCardMenuButton()
+            clickConfirmDeleteCreditCardButton()
+            verifyAddCreditCardsButton()
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512788
     @Test
     fun verifyCreditCardsSectionTest() {
         homeScreen {
@@ -214,6 +178,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1859917
     @Test
     fun verifyManageCreditCardsPromptOptionTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@@ -243,6 +208,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512790
     @Test
     fun verifyCreditCardsAutofillToggleTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@@ -283,6 +249,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512795
     @Test
     fun verifyEditCardsViewTest() {
         homeScreen {
@@ -318,6 +285,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512796
     @Test
     fun verifyEditedCardIsSavedTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@@ -365,8 +333,9 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512797
     @Test
-    fun verifyCreditCardCannotBeSavedWithoutCardNumberTest() {
+    fun verifyCreditCardCannotBeSavedWithoutCardNumberOrNameTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -390,29 +359,7 @@ class CreditCardAutofillTest {
             clickSaveCreditCardToolbarButton()
             verifyEditCreditCardToolbarTitle()
             verifyCreditCardNumberErrorMessage()
-        }
-    }
-
-    @Test
-    fun verifyCreditCardCannotBeSavedWithoutNameOnCardTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            verifyCreditCardsAutofillSection(true, false)
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            verifySavedCreditCardsSection(
-                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
-            )
+        }.goBackToSavedCreditCards {
             clickSavedCreditCard()
             clearNameOnCreditCard()
             clickSaveCreditCardToolbarButton()
@@ -421,8 +368,9 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512794
     @Test
-    fun verifyMultipleCreditCardsCanBeSavedTest() {
+    fun verifyMultipleCreditCardsCanBeAddedTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
 
         homeScreen {
@@ -476,8 +424,9 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271304
     @Test
-    fun verifyDoNotSaveCreditCardFromFormTest() {
+    fun verifyDoNotSaveCreditCardFromPromptTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
 
         navigationToolbar {
@@ -496,8 +445,9 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1779194
     @Test
-    fun verifySaveCreditCardFromFormTest() {
+    fun verifySaveCreditCardFromPromptTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
 
         navigationToolbar {
@@ -522,6 +472,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271305
     @Test
     fun verifyCancelCreditCardUpdatePromptTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@@ -572,6 +523,7 @@ class CreditCardAutofillTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1779195
     @Test
     fun verifyConfirmCreditCardUpdatePromptTest() {
         val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@@ -622,9 +574,10 @@ class CreditCardAutofillTest {
         }
     }
 
-    @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1847774")
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512791
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1854566")
     @Test
-    fun verifySavedCreditCardsRedirectionToAutofillAfterInterruptionTest() {
+    fun verifyCreditCardRedirectionsToAutofillSectionAfterInterruptionTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -639,33 +592,15 @@ class CreditCardAutofillTest {
             )
             clickManageSavedCreditCardsButton()
             clickSecuredCreditCardsLaterButton()
-            verifySavedCreditCardsSection(
-                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
-            )
+            clickSavedCreditCard()
             putAppToBackground()
             bringAppToForeground()
             verifyAutofillToolbarTitle()
-        }
-    }
-
-    @Test
-    fun verifyEditCreditCardRedirectionToAutofillAfterInterruptionTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            verifyCreditCardsAutofillSection(true, false)
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
             clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            clickSavedCreditCard()
+            verifySavedCreditCardsSection(
+                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
+                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
+            )
             putAppToBackground()
             bringAppToForeground()
             verifyAutofillToolbarTitle()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
index 1a6c62bfe..103e0af44 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CustomTabsTest.kt
@@ -206,7 +206,7 @@ class CustomTabsTest {
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }
         mDevice.openNotification()
         notificationShade {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
index 7a5b955f1..258adb4cb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
@@ -91,7 +91,6 @@ class DeepLinkTest {
 
     @Test
     fun openCollections() {
-        robot.openHomeScreen { /* do nothing */ }.dismissOnboarding()
         robot.openCollections {
             verifyCollectionsHeader()
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadFileTypesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadFileTypesTest.kt
index 9ba18a138..547d1b2ba 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadFileTypesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadFileTypesTest.kt
@@ -41,18 +41,20 @@ class DownloadFileTypesTest(fileName: String) {
             "videoSample.webm",
             "CSVfile.csv",
             "XMLfile.xml",
+            "tAJwqaWjJsXS8AhzSninBMCfIZbHBGgcc001lx5DIdDwIcfEgQ6vE5Gb5VgAled17DFZ2A7ZDOHA0NpQPHXXFt.svg",
         )
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/251028&group_by=cases:section_id&group_id=31659&group_order=asc
     @SmokeTest
     @Test
-    fun downloadMultipleFileTypesTest() {
+    fun allFilesAppearInDownloadsMenuTest() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.closeCompletedDownloadPrompt {
         }.openThreeDotMenu {
         }.openDownloadsManager {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
index 41ac1b437..3b64d7af8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
@@ -13,6 +13,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_APPS_PHOTOS
 import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_DOCS
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
@@ -20,6 +21,7 @@ import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.deleteDownloadedFileOnStorage
+import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.setNetworkEnabled
 import org.mozilla.fenix.ui.robots.browserScreen
@@ -72,8 +74,9 @@ class DownloadTest {
         setNetworkEnabled(enabled = true)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243844
     @Test
-    fun testDownloadPrompt() {
+    fun verifyTheDownloadPromptsTest() {
         downloadFile = "web_icon.png"
 
         navigationToolbar {
@@ -82,7 +85,7 @@ class DownloadTest {
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.clickOpen("image/png") {}
         downloadRobot {
             verifyPhotosAppOpens()
@@ -91,25 +94,34 @@ class DownloadTest {
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2299405
     @Test
-    fun testCloseDownloadPrompt() {
-        downloadFile = "smallZip.zip"
+    fun verifyTheDownloadFailedNotificationsTest() {
+        downloadFile = "1GB.zip"
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
             waitForPageToLoad()
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
-        }.closePrompt {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            verifyEmptyDownloadsList()
+        }.clickDownload {
+            setNetworkEnabled(enabled = false)
+            verifyDownloadFailedPrompt(downloadFile)
+            setNetworkEnabled(enabled = true)
+            clickTryAgainButton()
         }
+        mDevice.openNotification()
+        notificationShade {
+            verifySystemNotificationDoesNotExist("Download failed")
+            verifySystemNotificationExists(downloadFile)
+        }.closeNotificationTray {}
+        deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2298616
     @Test
-    fun testDownloadCompleteNotification() {
-        downloadFile = "smallZip.zip"
+    fun verifyDownloadCompleteNotificationTest() {
+        downloadFile = "web_icon.png"
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
@@ -117,15 +129,26 @@ class DownloadTest {
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }
         mDevice.openNotification()
         notificationShade {
             verifySystemNotificationExists("Download completed")
-        }
+            clickNotification("Download completed")
+            assertExternalAppOpens(GOOGLE_APPS_PHOTOS)
+            mDevice.pressBack()
+            mDevice.openNotification()
+            swipeDownloadNotification(
+                direction = "Left",
+                shouldDismissNotification = true,
+                canExpandNotification = false,
+            )
+            verifySystemNotificationDoesNotExist("Firefox Fenix")
+        }.closeNotificationTray {}
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/451563
     @Ignore("Failing: Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1813521")
     @SmokeTest
     @Test
@@ -148,8 +171,10 @@ class DownloadTest {
             verifySystemNotificationExists("Firefox Fenix")
             expandNotificationMessage()
             clickDownloadNotificationControlButton("PAUSE")
+            verifySystemNotificationExists("Download paused")
             clickDownloadNotificationControlButton("RESUME")
             clickDownloadNotificationControlButton("CANCEL")
+            verifySystemNotificationDoesNotExist(downloadFile)
             mDevice.pressBack()
         }
         browserScreen {
@@ -160,42 +185,9 @@ class DownloadTest {
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
-    /* Verifies downloads in the Downloads Menu:
-          - downloads appear in the list
-          - deleting a download from device storage, removes it from the Downloads Menu too
-     */
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2301474
     @Test
-    fun manageDownloadsInDownloadsMenuTest() {
-        // a long filename to verify it's correctly displayed on the prompt and in the Downloads menu
-        downloadFile =
-            "tAJwqaWjJsXS8AhzSninBMCfIZbHBGgcc001lx5DIdDwIcfEgQ6vE5Gb5VgAled17DFZ2A7ZDOHA0NpQPHXXFt.svg"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
-            waitForPageToLoad()
-        }.clickDownloadLink(downloadFile) {
-            verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-            verifyDownloadNotificationPopup()
-        }
-        browserScreen {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            waitForDownloadsListToExist()
-            verifyDownloadedFileName(downloadFile)
-            verifyDownloadedFileIcon()
-            deleteDownloadedFileOnStorage(downloadFile)
-        }.exitDownloadsManagerToBrowser {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            verifyEmptyDownloadsList()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun openDownloadedFileTest() {
+    fun openDownloadedFileFromDownloadsMenuTest() {
         downloadFile = "web_icon.png"
 
         navigationToolbar {
@@ -204,7 +196,7 @@ class DownloadTest {
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }
         browserScreen {
         }.openThreeDotMenu {
@@ -239,32 +231,11 @@ class DownloadTest {
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1114970
     @Test
     fun deleteDownloadedFileTest() {
         downloadFile = "smallZip.zip"
 
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
-            waitForPageToLoad()
-        }.clickDownloadLink(downloadFile) {
-            verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-            verifyDownloadedFileName(downloadFile)
-        }
-        browserScreen {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            verifyDownloadedFileName(downloadFile)
-            deleteDownloadedItem(downloadFile)
-            verifyEmptyDownloadsList()
-        }
-        deleteDownloadedFileOnStorage(downloadFile)
-    }
-
-    @Test
-    fun undoDeleteDownloadedFileTest() {
-        downloadFile = "smallZip.zip"
-
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
             waitForPageToLoad()
@@ -280,10 +251,13 @@ class DownloadTest {
             deleteDownloadedItem(downloadFile)
             clickSnackbarButton("UNDO")
             verifyDownloadedFileName(downloadFile)
+            deleteDownloadedItem(downloadFile)
+            verifyEmptyDownloadsList()
         }
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2302662
     @Test
     fun deleteMultipleDownloadedFilesTest() {
         val firstDownloadedFile = "smallZip.zip"
@@ -305,6 +279,13 @@ class DownloadTest {
         browserScreen {
         }.openThreeDotMenu {
         }.openDownloadsManager {
+            verifyDownloadedFileName(firstDownloadedFile)
+            verifyDownloadedFileName(secondDownloadedFile)
+            longClickDownloadedItem(firstDownloadedFile)
+            selectDownloadedItem(secondDownloadedFile)
+            openMultiSelectMoreOptionsMenu()
+            clickMultiSelectRemoveButton()
+            clickSnackbarButton("UNDO")
             verifyDownloadedFileName(firstDownloadedFile)
             verifyDownloadedFileName(secondDownloadedFile)
             longClickDownloadedItem(firstDownloadedFile)
@@ -317,70 +298,52 @@ class DownloadTest {
         deleteDownloadedFileOnStorage(secondDownloadedFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2301537
     @Test
-    fun undoDeleteMultipleDownloadedFilesTest() {
-        val firstDownloadedFile = "smallZip.zip"
-        val secondDownloadedFile = "textfile.txt"
+    fun fileDeletedFromStorageIsDeletedEverywhereTest() {
+        val downloadFile = "smallZip.zip"
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
             waitForPageToLoad()
-        }.clickDownloadLink(firstDownloadedFile) {
-            verifyDownloadPrompt(firstDownloadedFile)
-        }.clickDownload {
-            verifyDownloadedFileName(firstDownloadedFile)
-        }.closeCompletedDownloadPrompt {
-        }.clickDownloadLink(secondDownloadedFile) {
-            verifyDownloadPrompt(secondDownloadedFile)
+        }.clickDownloadLink(downloadFile) {
+            verifyDownloadPrompt(downloadFile)
         }.clickDownload {
-            verifyDownloadedFileName(secondDownloadedFile)
+            verifyDownloadCompleteNotificationPopup()
         }
         browserScreen {
         }.openThreeDotMenu {
         }.openDownloadsManager {
-            verifyDownloadedFileName(firstDownloadedFile)
-            verifyDownloadedFileName(secondDownloadedFile)
-            longClickDownloadedItem(firstDownloadedFile)
-            selectDownloadedItem(secondDownloadedFile)
-            openMultiSelectMoreOptionsMenu()
-            clickMultiSelectRemoveButton()
-            clickSnackbarButton("UNDO")
-            verifyDownloadedFileName(firstDownloadedFile)
-            verifyDownloadedFileName(secondDownloadedFile)
-        }
-        deleteDownloadedFileOnStorage(firstDownloadedFile)
-        deleteDownloadedFileOnStorage(secondDownloadedFile)
-    }
-
-    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1840994")
-    @Test
-    fun systemNotificationCantBeDismissedWhileDownloadingTest() {
-        // Clear the "Firefox Fenix default browser notification"
-        notificationShade {
-            cancelAllShownNotifications()
+            waitForDownloadsListToExist()
+            verifyDownloadedFileName(downloadFile)
+            deleteDownloadedFileOnStorage(downloadFile)
+        }.exitDownloadsManagerToBrowser {
+        }.openThreeDotMenu {
+        }.openDownloadsManager {
+            verifyEmptyDownloadsList()
+            exitMenu()
         }
 
-        downloadFile = "1GB.zip"
-
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
             waitForPageToLoad()
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
         }.clickDownload {
+            verifyDownloadCompleteNotificationPopup()
         }
         browserScreen {
-        }.openNotificationShade {
-            verifySystemNotificationExists("Firefox Fenix")
-            expandNotificationMessage()
-            swipeDownloadNotification("Left", false)
-            clickDownloadNotificationControlButton("CANCEL")
+        }.openThreeDotMenu {
+        }.openDownloadsManager {
+            waitForDownloadsListToExist()
+            verifyDownloadedFileName(downloadFile)
         }
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    @Ignore("Failing: https://bugzilla.mozilla.org/show_bug.cgi?id=1840994")
     @Test
-    fun systemNotificationCantBeDismissedWhileDownloadIsPausedTest() {
+    fun systemNotificationCantBeDismissedWhileInProgressTest() {
         // Clear the "Firefox Fenix default browser notification"
         notificationShade {
             cancelAllShownNotifications()
@@ -399,15 +362,9 @@ class DownloadTest {
         }.openNotificationShade {
             verifySystemNotificationExists("Firefox Fenix")
             expandNotificationMessage()
+            swipeDownloadNotification(direction = "Left", shouldDismissNotification = false)
             clickDownloadNotificationControlButton("PAUSE")
-            swipeDownloadNotification("Left", false)
-            verifySystemNotificationExists("Firefox Fenix")
-        }.closeNotificationTray {
-        }.openNotificationShade {
-            verifySystemNotificationExists("Firefox Fenix")
-            expandNotificationMessage()
-            swipeDownloadNotification("Right", false)
-            verifySystemNotificationExists("Firefox Fenix")
+            swipeDownloadNotification(direction = "Right", shouldDismissNotification = false)
             clickDownloadNotificationControlButton("CANCEL")
         }
         deleteDownloadedFileOnStorage(downloadFile)
@@ -427,8 +384,7 @@ class DownloadTest {
             waitForPageToLoad()
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-        }
+        }.clickDownload {}
 
         setNetworkEnabled(enabled = false)
 
@@ -438,8 +394,7 @@ class DownloadTest {
             expandNotificationMessage()
             swipeDownloadNotification("Left", true)
             verifySystemNotificationDoesNotExist("Firefox Fenix")
-        }.closeNotificationTray {
-        }
+        }.closeNotificationTray {}
 
         downloadRobot {
         }.closeDownloadPrompt {
@@ -449,56 +404,22 @@ class DownloadTest {
     }
 
     @Test
-    fun notificationCanBeDismissedIfDownloadIsCompletedTest() {
-        // Clear the "Firefox Fenix default browser notification"
-        notificationShade {
-            cancelAllShownNotifications()
-        }
-
-        downloadFile = "smallZip.zip"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
-            waitForPageToLoad()
-        }.clickDownloadLink(downloadFile) {
-            verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-        }
-
-        browserScreen {
-        }.openNotificationShade {
-            verifySystemNotificationExists("Download completed")
-            swipeDownloadNotification("Left", true, false)
-            verifySystemNotificationDoesNotExist("Firefox Fenix")
-        }.closeNotificationTray {
-        }
-
-        downloadRobot {
-        }.closeDownloadPrompt {
-            verifyDownloadPromptIsDismissed()
-        }
-        deleteDownloadedFileOnStorage(downloadFile)
-    }
+    fun warningWhenClosingPrivateTabsWhileDownloadingTest() {
+        downloadFile = "1GB.zip"
 
-    @Test
-    fun stayInPrivateBrowsingPromptTest() {
         // Clear the "Firefox Fenix default browser notification"
         notificationShade {
             cancelAllShownNotifications()
         }
 
-        downloadFile = "1GB.zip"
-
         homeScreen {
         }.togglePrivateBrowsingMode()
-
         navigationToolbar {
         }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
             waitForPageToLoad()
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-        }
+        }.clickDownload {}
         browserScreen {
         }.openTabDrawer {
             closeTab()
@@ -512,15 +433,16 @@ class DownloadTest {
         deleteDownloadedFileOnStorage(downloadFile)
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2302663
     @Test
-    fun cancelActiveDownloadsFromPrivateBrowsingPromptTest() {
+    fun cancelActivePrivateBrowsingDownloadsTest() {
+        downloadFile = "1GB.zip"
+
         // Clear the "Firefox Fenix default browser notification"
         notificationShade {
             cancelAllShownNotifications()
         }
 
-        downloadFile = "1GB.zip"
-
         homeScreen {
         }.togglePrivateBrowsingMode()
 
@@ -529,8 +451,7 @@ class DownloadTest {
             waitForPageToLoad()
         }.clickDownloadLink(downloadFile) {
             verifyDownloadPrompt(downloadFile)
-        }.clickDownload {
-        }
+        }.clickDownload {}
         browserScreen {
         }.openTabDrawer {
             closeTab()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt
index fc16704d2..2f3963caf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/EnhancedTrackingProtectionTest.kt
@@ -63,6 +63,7 @@ class EnhancedTrackingProtectionTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416046
     @Test
     fun testETPSettingsItemsAndSubMenus() {
         homeScreen {
@@ -97,30 +98,9 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1514599
     @Test
-    fun testETPSettingsSummaryChange() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyEnhancedTrackingProtectionButton()
-            verifySettingsOptionSummary("Enhanced Tracking Protection", "Standard")
-        }.openEnhancedTrackingProtectionSubMenu {
-            selectTrackingProtectionOption("Strict")
-        }.goBack {
-            verifySettingsOptionSummary("Enhanced Tracking Protection", "Strict")
-        }.openEnhancedTrackingProtectionSubMenu {
-            selectTrackingProtectionOption("Custom")
-        }.goBack {
-            verifySettingsOptionSummary("Enhanced Tracking Protection", "Custom")
-        }.openEnhancedTrackingProtectionSubMenu {
-            switchEnhancedTrackingProtectionToggle()
-        }.goBack {
-            verifySettingsOptionSummary("Enhanced Tracking Protection", "Off")
-        }
-    }
-
-    @Test
-    fun testETPOffGlobally() {
+    fun verifyETPStateIsReflectedInTPSheetTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
 
         homeScreen {
@@ -129,6 +109,8 @@ class EnhancedTrackingProtectionTest {
         }.openEnhancedTrackingProtectionSubMenu {
             switchEnhancedTrackingProtectionToggle()
             verifyEnhancedTrackingProtectionOptionsEnabled(false)
+        }.goBack {
+            verifySettingsOptionSummary("Enhanced Tracking Protection", "Off")
             exitMenu()
         }
 
@@ -151,10 +133,11 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339712
     // Tests adding ETP exceptions to websites and keeping that preference after restart
     @SmokeTest
     @Test
-    fun testDisableETPExceptionToggle() {
+    fun disablingETPOnAWebsiteAddsItToExceptionListTest() {
         val firstPage = getGenericAsset(mockWebServer, 1)
         val secondPage = "example.com"
 
@@ -182,8 +165,9 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339714
     @Test
-    fun trackingProtectionSwitchEnabledRemovesExceptionTest() {
+    fun enablingETPOnAWebsiteRemovesItFromTheExceptionListTest() {
         val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer)
 
         navigationToolbar {
@@ -212,9 +196,10 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339713
     // Tests removing TP exceptions individually or all at once
     @Test
-    fun clearTrackingProtectionExceptionsTest() {
+    fun clearWebsitesFromTPExceptionListTest() {
         val firstPage = getGenericAsset(mockWebServer, 1)
         val secondPage = "example.com"
 
@@ -249,11 +234,20 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/417444
     @Test
-    fun testStandardETPVisitSheetDetails() {
+    fun verifyTrackersBlockedWithStandardTPTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
         val trackingProtectionTest = getEnhancedTrackingProtectionAsset(mockWebServer).url
 
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifyEnhancedTrackingProtectionButton()
+            verifySettingsOptionSummary("Enhanced Tracking Protection", "Standard")
+            exitMenu()
+        }
+
         // browsing a generic page to allow GV to load on a fresh run
         navigationToolbar {
         }.enterURLAndEnterToBrowser(genericPage.url) {
@@ -280,12 +274,21 @@ class EnhancedTrackingProtectionTest {
         }.closeEnhancedTrackingProtectionSheet {}
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/417441
     @Test
-    fun testStrictVisitSheetDetails() {
+    fun verifyTrackersBlockedWithStrictTPTest() {
         appContext.settings().setStrictETP()
         val genericPage = getGenericAsset(mockWebServer, 1)
         val trackingProtectionTest = getEnhancedTrackingProtectionAsset(mockWebServer).url
 
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifyEnhancedTrackingProtectionButton()
+            verifySettingsOptionSummary("Enhanced Tracking Protection", "Strict")
+            exitMenu()
+        }
+
         // browsing a generic page to allow GV to load on a fresh run
         navigationToolbar {
         }.enterURLAndEnterToBrowser(genericPage.url) {
@@ -316,9 +319,10 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/561637
     @SmokeTest
     @Test
-    fun defaultCustomTrackingProtectionSettingsTest() {
+    fun verifyTrackersBlockedWithCustomTPTest() {
         val genericWebPage = getGenericAsset(mockWebServer, 1)
         val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer)
 
@@ -328,9 +332,12 @@ class EnhancedTrackingProtectionTest {
         }.openEnhancedTrackingProtectionSubMenu {
             selectTrackingProtectionOption("Custom")
             verifyCustomTrackingProtectionSettings()
-        }.goBackToHomeScreen {
-        }.openNavigationToolbar {
-            // browsing a basic page to allow GV to load on a fresh run
+        }.goBack {
+            verifySettingsOptionSummary("Enhanced Tracking Protection", "Custom")
+            exitMenu()
+        }
+
+        navigationToolbar {
         }.enterURLAndEnterToBrowser(genericWebPage.url) {
         }.openNavigationToolbar {
         }.enterURLAndEnterToBrowser(trackingPage.url) {
@@ -355,6 +362,7 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/562710
     // Tests the trackers blocked with the following Custom TP set up:
     // - Cookies set to "All cookies"
     // - Tracking content option OFF
@@ -398,8 +406,9 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/562709
     @Test
-    fun disableCustomTrackingProtectionOptionsTest() {
+    fun verifyTrackersBlockedWithCustomTPOptionsDisabledTest() {
         val genericWebPage = getGenericAsset(mockWebServer, 1)
         val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer)
 
@@ -430,8 +439,9 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2106997
     @Test
-    fun testTrackingContentBlockedOnlyInPrivateTabs() {
+    fun verifyTrackingContentBlockedOnlyInPrivateTabsTest() {
         val genericWebPage = getGenericAsset(mockWebServer, 1)
         val trackingPage = getEnhancedTrackingProtectionAsset(mockWebServer)
 
@@ -480,6 +490,7 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2285368
     @SmokeTest
     @Test
     fun blockCookiesStorageAccessTest() {
@@ -502,6 +513,7 @@ class EnhancedTrackingProtectionTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2285369
     @SmokeTest
     @Test
     fun allowCookiesStorageAccessTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
index e63cf953e..8526f3186 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -73,8 +73,9 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243285
     @Test
-    fun noHistoryItemsInCacheTest() {
+    fun verifyEmptyHistoryMenuTest() {
         homeScreen {
         }.openThreeDotMenu {
             verifyHistoryButton()
@@ -84,10 +85,12 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2302742
     // Test running on beta/release builds in CI:
     // caution when making changes to it, so they don't block the builds
+    @SmokeTest
     @Test
-    fun visitedUrlHistoryTest() {
+    fun verifyHistoryMenuWithHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -103,34 +106,16 @@ class HistoryTest {
                 verifyVisitedTimeTitle()
                 verifyFirstTestPageTitle("Test_Page_1")
                 verifyTestPageUrl(firstWebPage.url)
+                verifyDeleteHistoryItemButton("Test_Page_1")
             }
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243288
     @Test
     fun deleteHistoryItemTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryListExists()
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1),
-            ) {
-                clickDeleteHistoryButton(firstWebPage.url.toString())
-            }
-            verifyDeleteSnackbarText("Deleted")
-            verifyEmptyHistoryView()
-        }
-    }
-
-    @Test
-    fun undoDeleteHistoryItemTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
             mDevice.waitForIdle()
@@ -145,12 +130,16 @@ class HistoryTest {
             verifyUndoDeleteSnackBarButton()
             clickUndoDeleteButton()
             verifyHistoryItemExists(true, firstWebPage.url.toString())
+            clickDeleteHistoryButton(firstWebPage.url.toString())
+            verifyDeleteSnackbarText("Deleted")
+            verifyEmptyHistoryView()
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1848881
     @SmokeTest
     @Test
-    fun cancelDeleteAllHistoryTest() {
+    fun deleteAllHistoryTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -168,25 +157,7 @@ class HistoryTest {
             selectEverythingOption()
             cancelDeleteHistory()
             verifyHistoryItemExists(true, firstWebPage.url.toString())
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun deleteAllHistoryTest() {
-        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryListExists()
-            registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.history_list), 1),
-            ) {
-                clickDeleteAllHistoryButton()
-            }
+            clickDeleteAllHistoryButton()
             verifyDeleteConfirmationMessage()
             selectEverythingOption()
             confirmDeleteAllHistory()
@@ -195,7 +166,7 @@ class HistoryTest {
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339690
     @Test
     fun historyMultiSelectionToolbarItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -223,9 +194,10 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339696
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @Test
-    fun openHistoryInNewTabTest() {
+    fun openMultipleSelectedHistoryItemsInANewTabTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -253,8 +225,9 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/346098
     @Test
-    fun openHistoryInPrivateTabTest() {
+    fun openMultipleSelectedHistoryItemsInPrivateTabTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -278,8 +251,9 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/346099
     @Test
-    fun deleteMultipleSelectionTest() {
+    fun deleteMultipleSelectedHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
@@ -312,8 +286,9 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/339701
     @Test
-    fun shareButtonTest() {
+    fun shareMultipleSelectedHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -338,6 +313,7 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715627
     @Test
     fun verifySearchHistoryViewTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -380,6 +356,7 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715631
     @Test
     fun verifyVoiceSearchInHistoryTest() {
         homeScreen {
@@ -392,6 +369,7 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715632
     @Test
     fun verifySearchForHistoryItemsTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -407,13 +385,13 @@ class HistoryTest {
             // Search for a valid term
             typeSearch("generic")
             verifySearchEngineSuggestionResults(activityTestRule, firstWebPage.url.toString(), searchTerm = "generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
         }.dismissSearchBar {}
         historyMenu {
         }.clickSearchButton {
             // Search for invalid term
             typeSearch("Android")
-            verifyNoSuggestionsAreDisplayed(
+            verifySuggestionsAreNotDisplayed(
                 activityTestRule,
                 firstWebPage.url.toString(),
                 secondWebPage.url.toString(),
@@ -421,6 +399,7 @@ class HistoryTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1715634
     @Test
     fun verifyDeletedHistoryItemsCanNotBeSearchedTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -448,8 +427,8 @@ class HistoryTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, firstWebPage.url.toString())
-            verifyNoSuggestionsAreDisplayed(activityTestRule, secondWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, firstWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, secondWebPage.url.toString())
             verifySearchEngineSuggestionResults(
                 activityTestRule,
                 thirdWebPage.url.toString(),
@@ -463,7 +442,7 @@ class HistoryTest {
         }.clickSearchButton {
             // Search for a valid term
             typeSearch("generic")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, thirdWebPage.url.toString())
+            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
index 603572df6..9b1417f47 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
@@ -57,8 +57,11 @@ class HomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235396
     @Test
     fun homeScreenItemsTest() {
-        homeScreen {}.dismissOnboarding()
+        // Workaround to make sure the Pocket articles are populated before starting the test.
         homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.goBack {
             verifyHomeWordmark()
             verifyHomePrivateBrowsingButton()
             verifyExistingTopSitesTabs("Wikipedia")
@@ -80,7 +83,6 @@ class HomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199
     @Test
     fun privateBrowsingHomeScreenItemsTest() {
-        homeScreen { }.dismissOnboarding()
         homeScreen { }.togglePrivateBrowsingMode()
 
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
index 442e1776c..a2ec7ef4f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
@@ -67,6 +67,7 @@ class LoginsTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092713
     // Tests the Logins and passwords menu items and default values
     @Test
     fun loginsAndPasswordsSettingsItemsTest() {
@@ -82,10 +83,11 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517816
     // Tests only for initial state without signing in.
     // For tests after signing in, see SyncIntegration test suite
     @Test
-    fun savedLoginsMenuItemsTest() {
+    fun verifySavedLoginsListTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -101,8 +103,9 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092925
     @Test
-    fun syncLoginsMenuItemsTest() {
+    fun verifySyncLoginsOptionsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -115,8 +118,12 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/523839
     @Test
-    fun saveLoginsAndPasswordsOptionsItemsTest() {
+    fun saveLoginFromPromptTest() {
+        val saveLoginTest =
+            TestAssetHelper.getSaveLoginAsset(mockWebServer)
+
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -124,12 +131,8 @@ class LoginsTest {
         }.openSaveLoginsAndPasswordsOptions {
             verifySaveLoginsOptionsView()
         }
-    }
 
-    @Test
-    fun saveLoginFromPromptTest() {
-        val saveLoginTest =
-            TestAssetHelper.getSaveLoginAsset(mockWebServer)
+        exitMenu()
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(saveLoginTest.url) {
@@ -152,8 +155,9 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/960412
     @Test
-    fun openWebsiteForSavedLoginTest() {
+    fun openLoginWebsiteInBrowserTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
         val originWebsite = "mozilla-mobile.github.io"
         val userName = "test"
@@ -179,6 +183,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517817
     @Test
     fun neverSaveLoginFromPromptTest() {
         val saveLoginTest = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -206,9 +211,10 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1508171
     @SmokeTest
     @Test
-    fun updateSavedLoginTest() {
+    fun verifyUpdatedLoginIsSavedTest() {
         val saveLoginTest =
             TestAssetHelper.getSaveLoginAsset(mockWebServer)
 
@@ -241,6 +247,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1049971
     @SmokeTest
     @Test
     fun verifyMultipleLoginsSelectionsTest() {
@@ -277,6 +284,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875849
     @Test
     fun verifyEditLoginsViewTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -305,6 +313,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875851
     @Test
     fun verifyEditedLoginsAreSavedTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@@ -342,6 +351,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266452
     @Test
     fun verifyLoginWithNoUserNameCanNotBeSavedTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -371,6 +381,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266453
     @Test
     fun verifyLoginWithoutPasswordCanNotBeSavedTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -401,6 +412,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/876531
     @Test
     fun verifyEditModeDismissalDoesNotSaveLoginCredentialsTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@@ -431,6 +443,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/876532
     @Test
     fun verifyDeleteLoginButtonTest() {
         val loginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -461,6 +474,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517818
     @SmokeTest
     @Test
     fun verifyNeverSaveLoginOptionTest() {
@@ -484,6 +498,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517819
     @Test
     fun verifyAutofillToggleTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@@ -524,9 +539,10 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/593768
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1812995")
     @Test
-    fun verifyLoginIsNotUpdatedTest() {
+    fun doNotSaveOptionWillNotUpdateALoginTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
         val originWebsite = "mozilla-mobile.github.io"
 
@@ -572,6 +588,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2090455
     @Test
     fun searchLoginsByUsernameTest() {
         val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -618,6 +635,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/608834
     @Test
     fun searchLoginsByUrlTest() {
         val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -664,6 +682,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266441
     @Test
     fun verifyLastUsedLoginSortingOptionTest() {
         val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -710,6 +729,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266442
     @Test
     fun verifyAlphabeticalLoginSortingOptionTest() {
         val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -754,6 +774,7 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1518435
     @Test
     fun verifyAddLoginManuallyTest() {
         val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@@ -792,8 +813,9 @@ class LoginsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2068215
     @Test
-    fun verifyCopyUsernameTest() {
+    fun verifyCopyLoginCredentialsToClipboardTest() {
         val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
 
         navigationToolbar {
@@ -809,24 +831,6 @@ class LoginsTest {
             viewSavedLoginDetails("test@example.com")
             clickCopyUserNameButton()
             verifySnackBarText("Username copied to clipboard")
-        }
-    }
-
-    @Test
-    fun verifyCopyPasswordTest() {
-        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstLoginPage.url) {
-            clickSubmitLoginButton()
-            verifySaveLoginPromptIsDisplayed()
-            clickPageObject(itemWithText("Save"))
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openLoginsAndPasswordSubMenu {
-        }.openSavedLogins {
-            tapSetupLater()
-            viewSavedLoginDetails("test@example.com")
             clickCopyPasswordButton()
             verifySnackBarText("Password copied to clipboard")
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
index b2d5faf61..17c589e73 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTest.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.ui
 
+import androidx.core.net.toUri
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import mozilla.components.concept.engine.utils.EngineReleaseChannel
@@ -12,15 +13,20 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-import org.mozilla.fenix.helpers.HomeActivityTestRule
-import org.mozilla.fenix.helpers.RecyclerViewIdlingResource
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.MatcherHelper
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
+import org.mozilla.fenix.helpers.TestHelper.assertYoutubeAppOpens
 import org.mozilla.fenix.helpers.TestHelper.runWithCondition
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.clickContextMenuItem
+import org.mozilla.fenix.ui.robots.clickPageObject
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.longClickPageObject
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 class MainMenuTest {
@@ -28,7 +34,7 @@ class MainMenuTest {
     private lateinit var mockWebServer: MockWebServer
 
     @get:Rule
-    val activityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
+    val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
 
     @Before
     fun setUp() {
@@ -44,9 +50,9 @@ class MainMenuTest {
         mockWebServer.shutdown()
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/233849
     @Test
-    fun verifyPageMainMenuItemsTest() {
+    fun verifyTabMainMenuItemsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -57,109 +63,182 @@ class MainMenuTest {
         }
     }
 
+    // Verifies the list of items in the homescreen's 3 dot main menu
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/233848
     @SmokeTest
     @Test
-    fun openMainMenuNewTabItemTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+    fun homeMainMenuItemsTest() {
+        homeScreen {
         }.openThreeDotMenu {
-        }.clickNewTabButton {
-            verifySearchView()
+            verifyHomeThreeDotMainMenuItems(isRequestDesktopSiteEnabled = false)
+        }.openBookmarks {
+            verifyBookmarksMenuView()
+        }.goBack {
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyHistoryMenuView()
+        }.goBack {
+        }.openThreeDotMenu {
+        }.openDownloadsManager {
+            verifyEmptyDownloadsList()
+        }.goBack {
+        }.openThreeDotMenu {
+        }.openAddonsManagerMenu {
+            verifyAddonsListIsDisplayed(true)
+        }.goBack {
+        }.openThreeDotMenu {
+        }.openSyncSignIn {
+            verifyTurnOnSyncMenu()
+        }.goBack {}
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openWhatsNew {
+            verifyWhatsNewURL()
+        }.goToHomescreen {
+        }.openThreeDotMenu {
+        }.openHelp {
+            verifyHelpUrl()
+        }.goToHomescreen {
+        }.openThreeDotMenu {
+        }.openCustomizeHome {
+            verifyHomePageView()
+        }.goBackToHomeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifySettingsView()
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2284134
     @Test
-    fun openMainMenuBookmarksItemTest() {
+    fun openNewTabTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyBookmarksMenuView()
+        }.clickNewTabButton {
+            verifySearchView()
+        }.submitQuery("test") {
+            verifyTabCounter("2")
         }
     }
 
+    // Device or AVD requires a Google Services Android OS installation with Play Store installed
+    // Verifies the Open in app button when an app is installed
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/387756
     @SmokeTest
     @Test
-    fun openMainMenuHistoryItemTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+    fun openInAppFunctionalityTest() {
+        val youtubeURL = "vnd.youtube://".toUri()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        }.enterURLAndEnterToBrowser(youtubeURL) {
+            verifyNotificationDotOnMainMenu()
         }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryListExists()
+        }.clickOpenInApp {
+            assertYoutubeAppOpens()
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2284323
     @Test
-    fun openMainMenuAddonsTest() {
+    fun openSyncAndSaveDataTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            mDevice.waitForIdle()
         }.openThreeDotMenu {
-        }.openAddonsManagerMenu {
-            TestHelper.registerAndCleanupIdlingResources(
-                RecyclerViewIdlingResource(
-                    activityTestRule.activity.findViewById(R.id.add_ons_list),
-                    1,
-                ),
-            ) {
-                verifyAddonsItems()
-            }
+        }.openSyncSignIn {
+            verifyTurnOnSyncMenu()
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243840
     @Test
-    fun openMainMenuSyncItemTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+    fun findInPageTest() {
+        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
             mDevice.waitForIdle()
         }.openThreeDotMenu {
-        }.openSyncSignIn {
-            verifyTurnOnSyncMenu()
+            verifyThreeDotMenuExists()
+            verifyFindInPageButton()
+        }.openFindInPage {
+            verifyFindInPageNextButton()
+            verifyFindInPagePrevButton()
+            verifyFindInPageCloseButton()
+            enterFindInPageQuery("a")
+            verifyFindNextInPageResult("1/3")
+            clickFindInPageNextButton()
+            verifyFindNextInPageResult("2/3")
+            clickFindInPageNextButton()
+            verifyFindNextInPageResult("3/3")
+            clickFindInPagePrevButton()
+            verifyFindPrevInPageResult("2/3")
+            clickFindInPagePrevButton()
+            verifyFindPrevInPageResult("1/3")
+        }.closeFindInPageWithCloseButton {
+            verifyFindInPageBar(false)
+        }.openThreeDotMenu {
+        }.openFindInPage {
+            enterFindInPageQuery("3")
+            verifyFindNextInPageResult("1/1")
+        }.closeFindInPageWithBackButton {
+            verifyFindInPageBar(false)
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2283303
     @Test
-    fun openMainMenuFindInPageTest() {
+    fun switchDesktopSiteModeOnOffTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
-        }.openFindInPage {
-            verifyFindInPageSearchBarItems()
+        }.switchDesktopSiteMode {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.switchDesktopSiteMode {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1314137
     @Test
-    fun mainMenuDesktopSiteTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+    fun setDesktopSiteBeforePageLoadTest() {
+        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
 
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        homeScreen {
         }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
         }.switchDesktopSiteMode {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+            clickPageObject(MatcherHelper.itemContainingText("Link 1"))
         }.openThreeDotMenu {
             verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+            longClickPageObject(MatcherHelper.itemWithText("Link 2"))
+            clickContextMenuItem("Open link in new tab")
+            TestHelper.clickSnackbarButton("SWITCH")
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2283302
     @Test
-    fun mainMenuReportSiteIssueTest() {
+    fun reportSiteIssueTest() {
         runWithCondition(
             // This test will not run on RC builds because the "Report site issue button" is not available.
             activityTestRule.activity.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE,
@@ -175,50 +254,77 @@ class MainMenuTest {
         }
     }
 
+    // Verifies the Add to home screen option in a tab's 3 dot menu
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/410724
     @SmokeTest
     @Test
-    fun openMainMenuAddToCollectionTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+    fun addPageShortcutToHomeScreenTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val shortcutTitle = TestHelper.generateRandomString(5)
 
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+        }.openThreeDotMenu {
+            expandMenu()
+        }.openAddToHomeScreen {
+            clickCancelShortcutButton()
+        }
+
+        browserScreen {
         }.openThreeDotMenu {
-        }.openSaveToCollection {
-            verifyCollectionNameTextField()
+            expandMenu()
+        }.openAddToHomeScreen {
+            verifyShortcutTextFieldTitle("Test_Page_1")
+            addShortcutName(shortcutTitle)
+            clickAddShortcutButton()
+            clickAddAutomaticallyButton()
+        }.openHomeScreenShortcut(shortcutTitle) {
+            verifyUrl(website.url.toString())
+            verifyTabCounter("1")
         }
     }
 
-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/329893
     @SmokeTest
     @Test
-    fun openMainMenuSettingsItemTest() {
+    fun mainMenuShareButtonTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsView()
+        }.clickShareButton {
+            verifyShareTabLayout()
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/233604
     @Test
-    fun mainMenuShareButtonTest() {
+    fun navigateBackAndForwardTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            mDevice.waitForIdle()
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(nextWebPage.url) {
+            verifyUrl(nextWebPage.url.toString())
         }.openThreeDotMenu {
-        }.clickShareButton {
-            verifyShareTabLayout()
+        }.goToPreviousPage {
+            mDevice.waitForIdle()
+            verifyUrl(defaultWebPage.url.toString())
+        }.openThreeDotMenu {
+        }.goForward {
+            verifyUrl(nextWebPage.url.toString())
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2195819
     @SmokeTest
     @Test
-    fun mainMenuRefreshButtonTest() {
+    fun refreshPageButtonTest() {
         val refreshWebPage = TestAssetHelper.getRefreshAsset(mockWebServer)
 
         navigationToolbar {
@@ -231,9 +337,9 @@ class MainMenuTest {
         }
     }
 
-    @SmokeTest
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2265657
     @Test
-    fun mainMenuForceRefreshTest() {
+    fun forceRefreshPageTest() {
         val refreshWebPage = TestAssetHelper.getRefreshAsset(mockWebServer)
 
         navigationToolbar {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
index 15c259c01..2f842939f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
@@ -15,10 +15,8 @@ import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper.runWithSystemLocaleChanged
-import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import java.util.Locale
@@ -54,51 +52,7 @@ class NavigationToolbarTest {
         mockWebServer.shutdown()
     }
 
-    @Test
-    fun goBackTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(nextWebPage.url) {
-            verifyUrl(nextWebPage.url.toString())
-        }.openThreeDotMenu {
-        }.goToPreviousPage {
-            mDevice.waitForIdle()
-            verifyUrl(defaultWebPage.url.toString())
-        }
-    }
-
-    @Test
-    fun goForwardTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val nextWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(nextWebPage.url) {
-            mDevice.waitForIdle()
-            verifyUrl(nextWebPage.url.toString())
-        }.openThreeDotMenu {
-        }.goToPreviousPage {
-            mDevice.waitForIdle()
-            verifyUrl(defaultWebPage.url.toString())
-        }
-
-        // Re-open the three-dot menu for verification
-        navigationToolbar {
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-        }.goForward {
-            verifyUrl(nextWebPage.url.toString())
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/987326
     // Swipes the nav bar left/right to switch between tabs
     @SmokeTest
     @Test
@@ -118,6 +72,7 @@ class NavigationToolbarTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/987327
     // Because it requires changing system prefs, this test will run only on Debug builds
     @Test
     fun swipeToSwitchTabInRTLTest() {
@@ -139,85 +94,7 @@ class NavigationToolbarTest {
         }
     }
 
-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun visitURLTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            verifyUrl(defaultWebPage.url.toString())
-        }
-    }
-
-    @Test
-    fun findInPageTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 3)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-            verifyFindInPageButton()
-        }.openFindInPage {
-            verifyFindInPageNextButton()
-            verifyFindInPagePrevButton()
-            verifyFindInPageCloseButton()
-            enterFindInPageQuery("a")
-            verifyFindNextInPageResult("1/3")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/3")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("3/3")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("2/3")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/3")
-        }.closeFindInPageWithCloseButton {
-            verifyFindInPageBar(false)
-        }.openThreeDotMenu {
-        }.openFindInPage {
-            enterFindInPageQuery("3")
-            verifyFindNextInPageResult("1/1")
-        }.closeFindInPageWithBackButton {
-            verifyFindInPageBar(false)
-        }
-    }
-
-    @Test
-    fun pdfFindInPageTest() {
-        val genericURL =
-            TestAssetHelper.getGenericAsset(mockWebServer, 3)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            clickPageObject(itemWithText("PDF form file"))
-        }.openThreeDotMenu {
-            verifyThreeDotMenuExists()
-            verifyFindInPageButton()
-        }.openFindInPage {
-            verifyFindInPageNextButton()
-            verifyFindInPagePrevButton()
-            verifyFindInPageCloseButton()
-            enterFindInPageQuery("l")
-            verifyFindNextInPageResult("1/2")
-            clickFindInPageNextButton()
-            verifyFindNextInPageResult("2/2")
-            clickFindInPagePrevButton()
-            verifyFindPrevInPageResult("1/2")
-        }.closeFindInPageWithCloseButton {
-            verifyFindInPageBar(false)
-        }.openThreeDotMenu {
-        }.openFindInPage {
-            enterFindInPageQuery("p")
-            verifyFindNextInPageResult("1/1")
-        }.closeFindInPageWithBackButton {
-            verifyFindInPageBar(false)
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2265279
     @SmokeTest
     @Test
     fun verifySecurePageSecuritySubMenuTest() {
@@ -233,6 +110,7 @@ class NavigationToolbarTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2265280
     @SmokeTest
     @Test
     fun verifyInsecurePageSecuritySubMenuTest() {
@@ -248,6 +126,8 @@ class NavigationToolbarTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1661318
+    @SmokeTest
     @Test
     fun verifyClearCookiesFromQuickSettingsTest() {
         val helpPageUrl = "mozilla.org"
@@ -260,4 +140,36 @@ class NavigationToolbarTest {
             verifyClearSiteDataPrompt(helpPageUrl)
         }
     }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1360555
+    @SmokeTest
+    @Test
+    fun goToHomeScreenTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            mDevice.waitForIdle()
+        }.goToHomescreen {
+            verifyHomeScreen()
+        }
+    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2256552
+    @SmokeTest
+    @Test
+    fun goToHomeScreenInPrivateModeTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+            togglePrivateBrowsingModeOnOff()
+        }
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            mDevice.waitForIdle()
+        }.goToHomescreen {
+            verifyHomeScreen()
+        }
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusEventTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusEventTest.kt
index 55b45aee6..0d63197d9 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusEventTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusEventTest.kt
@@ -22,7 +22,6 @@ import org.mozilla.fenix.helpers.Experimentation
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestHelper.appContext
-import org.mozilla.fenix.ui.robots.homeScreen
 
 class NimbusEventTest {
     private lateinit var mDevice: UiDevice
@@ -56,8 +55,6 @@ class NimbusEventTest {
 
     @Test
     fun homeScreenNimbusEventsTest() {
-        homeScreen { }.dismissOnboarding()
-
         Experimentation.withHelper {
             assertTrue(evalJexl("'app_opened'|eventSum('Days', 28, 0) > 0"))
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NoNetworkAccessStartupTests.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NoNetworkAccessStartupTests.kt
index 9f9c9c680..e86254832 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NoNetworkAccessStartupTests.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NoNetworkAccessStartupTests.kt
@@ -43,8 +43,6 @@ class NoNetworkAccessStartupTests {
 
         activityTestRule.launchActivity(null)
 
-        homeScreen {
-        }.dismissOnboarding()
         homeScreen {
             verifyHomeScreen()
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
index 9b50e27f3..841785d1c 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/PDFViewerTest.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.ui
 
+import androidx.core.net.toUri
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
@@ -15,10 +16,10 @@ import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_DOCS
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.MatcherHelper
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
-import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.TestHelper.deleteDownloadedFileOnStorage
@@ -28,6 +29,11 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 
 class PDFViewerTest {
     private lateinit var mockWebServer: MockWebServer
+    private val downloadTestPage =
+        "https://storage.googleapis.com/mobile_test_assets/test_app/downloads.html"
+    private val pdfFileName = "washington.pdf"
+    private val pdfFileURL = "storage.googleapis.com/mobile_test_assets/public/washington.pdf"
+    private val pdfFileContent = "Washington Crossing the Delaware"
 
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
@@ -50,7 +56,7 @@ class PDFViewerTest {
     @Test
     fun openPDFInBrowserTest() {
         val genericURL =
-            TestAssetHelper.getGenericAsset(mockWebServer, 3)
+            getGenericAsset(mockWebServer, 3)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(genericURL.url) {
@@ -88,4 +94,55 @@ class PDFViewerTest {
         }
         deleteDownloadedFileOnStorage(downloadFile)
     }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2283305
+    @Test
+    fun pdfFindInPageTest() {
+        val genericURL = getGenericAsset(mockWebServer, 3)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            clickPageObject(MatcherHelper.itemWithText("PDF form file"))
+        }.openThreeDotMenu {
+            verifyThreeDotMenuExists()
+            verifyFindInPageButton()
+        }.openFindInPage {
+            verifyFindInPageNextButton()
+            verifyFindInPagePrevButton()
+            verifyFindInPageCloseButton()
+            enterFindInPageQuery("l")
+            verifyFindNextInPageResult("1/2")
+            clickFindInPageNextButton()
+            verifyFindNextInPageResult("2/2")
+            clickFindInPagePrevButton()
+            verifyFindPrevInPageResult("1/2")
+        }.closeFindInPageWithCloseButton {
+            verifyFindInPageBar(false)
+        }.openThreeDotMenu {
+        }.openFindInPage {
+            enterFindInPageQuery("p")
+            verifyFindNextInPageResult("1/1")
+        }.closeFindInPageWithBackButton {
+            verifyFindInPageBar(false)
+        }
+    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2284297
+    @Test
+    fun addPDFToHomeScreenTest() {
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(downloadTestPage.toUri()) {
+            clickPageObject(MatcherHelper.itemContainingText(pdfFileName))
+            verifyUrl(pdfFileURL)
+            verifyPageContent(pdfFileContent)
+        }.openThreeDotMenu {
+            expandMenu()
+        }.openAddToHomeScreen {
+            verifyShortcutTextFieldTitle(pdfFileName)
+            clickAddShortcutButton()
+            clickAddAutomaticallyButton()
+        }.openHomeScreenShortcut(pdfFileName) {
+            verifyUrl(pdfFileURL)
+        }
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/PocketTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/PocketTest.kt
index 757ec2941..885fa80c0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/PocketTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/PocketTest.kt
@@ -30,6 +30,12 @@ class PocketTest {
     @Before
     fun setUp() {
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+        // Workaround to make sure the Pocket articles are populated before starting the tests.
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.goBack {}
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252509
@@ -40,9 +46,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyThoughtProvokingStories(true)
             scrollToPocketProvokingStories()
@@ -70,9 +73,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyThoughtProvokingStories(true)
             scrollToPocketProvokingStories()
@@ -90,9 +90,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             scrollToPocketProvokingStories()
             verifyDiscoverMoreStoriesButton()
@@ -109,9 +106,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyStoriesByTopicItemState(activityTestRule, false, 1)
             clickStoriesByTopicItem(activityTestRule, 1)
@@ -127,9 +121,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyPoweredByPocket()
         }.clickPocketLearnMoreLink(activityTestRule) {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/PwaTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/PwaTest.kt
index 932c3ca8f..0b8cb35af 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/PwaTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/PwaTest.kt
@@ -16,6 +16,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
 import org.mozilla.fenix.helpers.TestHelper
+import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
 import org.mozilla.fenix.helpers.TestHelper.assertNativeAppOpens
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.ui.robots.addToHomeScreen
@@ -58,7 +59,6 @@ class PwaTest {
         }
     }
 
-    @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1807275")
     @Test
     fun emailLinkPWATest() {
         navigationToolbar {
@@ -71,7 +71,7 @@ class PwaTest {
         }.openHomeScreenShortcut(shortcutTitle) {
             clickPageObject(itemContainingText("Email link"))
             clickPageObject(itemWithResIdAndText("android:id/button1", "OPEN"))
-            assertNativeAppOpens(GMAIL_APP, emailLink)
+            assertExternalAppOpens(GMAIL_APP)
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
index d759f4298..7d13909b0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -20,11 +20,13 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.Constants.PackageName.ANDROID_SETTINGS
 import org.mozilla.fenix.helpers.Constants.searchEngineCodes
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
+import org.mozilla.fenix.helpers.MockBrowserDataHelper.createBookmarkItem
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.createHistoryItem
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.createTabItem
 import org.mozilla.fenix.helpers.MockBrowserDataHelper.setCustomSearchEngine
@@ -647,7 +649,7 @@ class SearchTest {
             clickSearchSelectorButton()
             selectTemporarySearchMethod(searchEngineName = "History")
             typeSearch(searchTerm = "Mozilla")
-            verifyNoSuggestionsAreDisplayed(rule = activityTestRule, "Mozilla")
+            verifySuggestionsAreNotDisplayed(rule = activityTestRule, "Mozilla")
             clickClearButton()
             typeSearch(searchTerm = "generic")
             verifyTypedToolbarText("generic")
@@ -684,7 +686,7 @@ class SearchTest {
                 clickSearchSelectorButton()
                 selectTemporarySearchMethod(searchEngineName = "Tabs")
                 typeSearch(searchTerm = "Mozilla")
-                verifyNoSuggestionsAreDisplayed(rule = activityTestRule, "Mozilla")
+                verifySuggestionsAreNotDisplayed(rule = activityTestRule, "Mozilla")
                 clickClearButton()
                 typeSearch(searchTerm = "generic")
                 verifyTypedToolbarText("generic")
@@ -705,4 +707,50 @@ class SearchTest {
             }
         }
     }
+
+    @SmokeTest
+    @Test
+    fun searchHistoryNotRememberedInPrivateBrowsingTest() {
+        appContext.settings().shouldShowSearchSuggestionsInPrivate = true
+
+        val firstPageUrl = getGenericAsset(searchMockServer, 1)
+        val searchEngineName = "TestSearchEngine"
+
+        setCustomSearchEngine(searchMockServer, searchEngineName)
+        createBookmarkItem(firstPageUrl.url.toString(), firstPageUrl.title, 1u)
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.clickUrlbar {
+        }.submitQuery("test page 1") {
+        }.goToHomescreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.clickUrlbar {
+        }.submitQuery("test page 2") {
+        }.openNavigationToolbar {
+        }.clickUrlbar {
+            typeSearch(searchTerm = "test page")
+            verifySearchEngineSuggestionResults(
+                rule = activityTestRule,
+                searchSuggestions = arrayOf(
+                    "TestSearchEngine search",
+                    "test page 1",
+                    "Firefox Suggest",
+                    firstPageUrl.url.toString(),
+                ),
+                searchTerm = "test page 1",
+            )
+            // 2 search engine suggestions and 2 browser suggestions (1 history, 1 bookmark)
+            verifySearchSuggestionsCount(activityTestRule, numberOfSuggestions = 4, searchTerm = "test page")
+            verifySuggestionsAreNotDisplayed(
+                activityTestRule,
+                searchSuggestions = arrayOf(
+                    "test page 2",
+                ),
+            )
+        }
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
index 8f3236701..bd2debace 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
@@ -49,23 +49,22 @@ class SettingsAboutTest {
         mockWebServer.shutdown()
     }
 
-    // Walks through settings menu and sub-menus to ensure all items are present
+    // Walks through the About settings menu to ensure all items are present
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092700
     @Test
-    fun settingsAboutItemsTest() {
-        // ABOUT
+    fun verifyAboutSettingsItemsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
-            // ABOUT
             verifyAboutHeading()
             verifyRateOnGooglePlay()
             verifyAboutFirefoxPreview()
         }
     }
 
-    // ABOUT
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246966
     @Test
-    fun verifyRateOnGooglePlayRedirect() {
+    fun verifyRateOnGooglePlayButton() {
         activityIntentTestRule.applySettingsExceptions {
             it.isTCPCFREnabled = false
         }
@@ -81,8 +80,9 @@ class SettingsAboutTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246961
     @Test
-    fun verifyAboutFirefoxPreview() {
+    fun verifyAboutFirefoxMenuItems() {
         activityIntentTestRule.applySettingsExceptions {
             it.isJumpBackInCFREnabled = false
             it.isTCPCFREnabled = false
@@ -91,7 +91,7 @@ class SettingsAboutTest {
         }.openThreeDotMenu {
         }.openSettings {
         }.openAboutFirefoxPreview {
-            verifyAboutFirefoxPreview()
+            verifyAboutFirefoxPreviewInfo()
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
index ddf3ff9ad..a030cde3b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
@@ -47,9 +47,10 @@ class SettingsAddonsTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875780
     // Walks through settings add-ons menu to ensure all items are present
     @Test
-    fun settingsAddonsItemsTest() {
+    fun verifyAddonsListItemsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -64,9 +65,10 @@ class SettingsAddonsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875781
     // Installs an add-on from the Add-ons menu and verifies the prompts
     @Test
-    fun installAddonTest() {
+    fun installAddonFromMainMenuTest() {
         val addonName = "uBlock Origin"
 
         homeScreen {}
@@ -92,9 +94,10 @@ class SettingsAddonsTest {
             }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/561597
     // Installs an addon, then uninstalls it
     @Test
-    fun verifyAddonsCanBeUninstalled() {
+    fun verifyAddonsCanBeUninstalledTest() {
         val addonName = "uBlock Origin"
 
         addonsMenu {
@@ -112,6 +115,7 @@ class SettingsAddonsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/561600
     // Installs uBlock add-on and checks that the app doesn't crash while loading pages with trackers
     @SmokeTest
     @Test
@@ -133,9 +137,10 @@ class SettingsAddonsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/561594
     @SmokeTest
     @Test
-    fun useAddonsInPrivateModeTest() {
+    fun verifyUBlockWorksInPrivateModeTest() {
         val addonName = "uBlock Origin"
         val genericPage = getGenericAsset(mockWebServer, 1)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
index 4c18d5c38..acc0c3aa2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
@@ -32,6 +32,11 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
 class SettingsAdvancedTest {
     private lateinit var mDevice: UiDevice
     private lateinit var mockWebServer: MockWebServer
+    private val youTubeSchemaLink = itemContainingText("Youtube schema link")
+    private val youTubeFullLink = itemContainingText("Youtube full link")
+    private val playStoreLink = itemContainingText("Playstore link")
+    private val playStoreUrl = "play.google.com"
+    private val youTubePage = "vnd.youtube://".toUri()
 
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
@@ -50,9 +55,10 @@ class SettingsAdvancedTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092699
     // Walks through settings menu and sub-menus to ensure all items are present
     @Test
-    fun settingsAdvancedItemsTest() {
+    fun verifyAdvancedSettingsSectionItemsTest() {
         // ADVANCED
         homeScreen {
         }.openThreeDotMenu {
@@ -71,24 +77,12 @@ class SettingsAdvancedTest {
         }
     }
 
-    @SmokeTest
-    @Test
-    fun verifyOpenLinkInAppViewTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyOpenLinksInAppsButton()
-            verifySettingsOptionSummary("Open links in apps", "Never")
-        }.openOpenLinksInAppsMenu {
-            verifyOpenLinksInAppsView("Never")
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2121046
     // Assumes Youtube is installed and enabled
     @SmokeTest
     @Test
     fun neverOpenLinkInAppTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.openThreeDotMenu {
@@ -102,17 +96,18 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(playStoreLink)
             waitForPageToLoad()
-            verifyUrl("youtube.com")
+            verifyUrl(playStoreUrl)
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2121052
     // Assumes Youtube is installed and enabled
     @Test
     fun privateBrowsingNeverOpenLinkInAppTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.togglePrivateBrowsingMode()
@@ -129,18 +124,19 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(playStoreLink)
             waitForPageToLoad()
-            verifyUrl("youtube.com")
+            verifyUrl(playStoreUrl)
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2121045
     // Assumes Youtube is installed and enabled
     @SmokeTest
     @Test
     fun askBeforeOpeningLinkInAppCancelTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.openThreeDotMenu {
@@ -158,20 +154,21 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(youTubeFullLink)
             verifyOpenLinkInAnotherAppPrompt()
             clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL"))
             waitForPageToLoad()
-            verifyUrl("youtube.com")
+            verifyUrl("youtube")
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2288347
     // Assumes Youtube is installed and enabled
     @SmokeTest
     @Test
     fun askBeforeOpeningLinkInAppOpenTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.openThreeDotMenu {
@@ -189,8 +186,8 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(youTubeSchemaLink)
             verifyOpenLinkInAnotherAppPrompt()
             clickPageObject(itemWithResIdAndText("android:id/button1", "OPEN"))
             mDevice.waitForIdle()
@@ -198,10 +195,11 @@ class SettingsAdvancedTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2121051
     // Assumes Youtube is installed and enabled
     @Test
     fun privateBrowsingAskBeforeOpeningLinkInAppCancelTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.togglePrivateBrowsingMode()
@@ -222,19 +220,20 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
-            verifyPrivateBrowsingOpenLinkInAnotherAppPrompt("youtube.com")
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(youTubeFullLink)
+            verifyPrivateBrowsingOpenLinkInAnotherAppPrompt("youtube")
             clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL"))
             waitForPageToLoad()
-            verifyUrl("youtube.com")
+            verifyUrl("youtube")
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2288350
     // Assumes Youtube is installed and enabled
     @Test
     fun privateBrowsingAskBeforeOpeningLinkInAppOpenTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.togglePrivateBrowsingMode()
@@ -255,19 +254,20 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
-            verifyPrivateBrowsingOpenLinkInAnotherAppPrompt("youtube.com")
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(youTubeSchemaLink)
+            verifyPrivateBrowsingOpenLinkInAnotherAppPrompt("youtube")
             clickPageObject(itemWithResIdAndText("android:id/button1", "OPEN"))
             mDevice.waitForIdle()
             assertYoutubeAppOpens()
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1058618
     // Assumes Youtube is installed and enabled
     @Test
     fun alwaysOpenLinkInAppTest() {
-        val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
+        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)
 
         homeScreen {
         }.openThreeDotMenu {
@@ -285,22 +285,22 @@ class SettingsAdvancedTest {
         exitMenu()
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            clickPageObject(itemContainingText("Youtube link"))
+        }.enterURLAndEnterToBrowser(externalLinksPage.url) {
+            clickPageObject(youTubeSchemaLink)
             mDevice.waitForIdle()
             assertYoutubeAppOpens()
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1058617
     @Test
     fun dismissOpenLinksInAppCFRTest() {
         activityIntentTestRule.applySettingsExceptions {
             it.isOpenInAppBannerEnabled = true
         }
-        val defaultWebPage = "https://m.youtube.com/"
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.toUri()) {
+        }.enterURLAndEnterToBrowser(youTubePage) {
             waitForPageToLoad()
             verifyOpenLinksInAppsCFRExists(true)
             clickOpenLinksInAppsDismissCFRButton()
@@ -308,15 +308,15 @@ class SettingsAdvancedTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2288331
     @Test
     fun goToSettingsFromOpenLinksInAppCFRTest() {
         activityIntentTestRule.applySettingsExceptions {
             it.isOpenInAppBannerEnabled = true
         }
-        val defaultWebPage = "https://m.youtube.com/"
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.toUri()) {
+        }.enterURLAndEnterToBrowser(youTubePage) {
             waitForPageToLoad()
             verifyOpenLinksInAppsCFRExists(true)
         }.clickOpenLinksInAppsGoToSettingsCFRButton {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt
index 72619bea9..78b0b4af8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt
@@ -49,8 +49,9 @@ class SettingsCustomizeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/344212
     @Test
-    fun changeThemeSettingTest() {
+    fun changeThemeOfTheAppTest() {
         // Goes through the settings and changes the default search engine, then verifies it changes.
         homeScreen {
         }.openThreeDotMenu {
@@ -64,6 +65,7 @@ class SettingsCustomizeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/466571
     @Test
     fun setToolbarPositionTest() {
         homeScreen {
@@ -88,8 +90,9 @@ class SettingsCustomizeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1058682
     @Test
-    fun swipeToolbarGesturePreferenceOffTest() {
+    fun turnOffSwipeToSwitchTabsPreferenceTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
 
@@ -114,6 +117,7 @@ class SettingsCustomizeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1992289
     @Test
     fun pullToRefreshPreferenceTest() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt
index 99d31bf07..d161098dd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt
@@ -60,8 +60,9 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416048
     @Test
-    fun deleteBrowsingDataOnQuitSettingsItemsTest() {
+    fun deleteBrowsingDataOnQuitSettingTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -88,6 +89,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416049
     @Test
     fun deleteOpenTabsOnQuitTest() {
         val testPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@@ -112,8 +114,9 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416050
     @Test
-    fun deleteHistoryOnQuitTest() {
+    fun deleteBrowsingHistoryOnQuitTest() {
         val genericPage =
             getStorageTestAsset(mockWebServer, "generic1.html")
 
@@ -140,6 +143,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416051
     @Test
     fun deleteCookiesAndSiteDataOnQuitTest() {
         val storageWritePage =
@@ -174,6 +178,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1243096
     @SmokeTest
     @Test
     fun deleteDownloadsOnQuitTest() {
@@ -191,7 +196,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }.clickDownloadLink("smallZip.zip") {
             verifyDownloadPrompt("smallZip.zip")
         }.clickDownload {
-            verifyDownloadNotificationPopup()
+            verifyDownloadCompleteNotificationPopup()
         }.closeCompletedDownloadPrompt {
         }.goToHomescreen {
         }.openThreeDotMenu {
@@ -207,6 +212,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         deleteDownloadedFileOnStorage("smallZip.zip")
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416053
     @SmokeTest
     @Test
     fun deleteSitePermissionsOnQuitTest() {
@@ -242,6 +248,7 @@ class SettingsDeleteBrowsingDataOnQuitTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416052
     @Test
     fun deleteCachedFilesOnQuitTest() {
         val pocketTopArticles = TestHelper.getStringResource(R.string.pocket_pinned_top_articles)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt
index e36c7ecd6..0b89b8461 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.ui
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
@@ -51,6 +52,7 @@ class SettingsDeleteBrowsingDataTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/937561
     @Test
     fun deleteBrowsingDataOptionStatesTest() {
         homeScreen {
@@ -109,8 +111,9 @@ class SettingsDeleteBrowsingDataTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517811
     @Test
-    fun deleteTabsDataWithNoOpenTabsTest() {
+    fun deleteOpenTabsBrowsingDataWithNoOpenTabsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -126,9 +129,10 @@ class SettingsDeleteBrowsingDataTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/353531
     @SmokeTest
     @Test
-    fun deleteTabsDataTest() {
+    fun deleteOpenTabsBrowsingDataTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -158,6 +162,7 @@ class SettingsDeleteBrowsingDataTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/378864
     @SmokeTest
     @Test
     fun deleteBrowsingHistoryTest() {
@@ -188,6 +193,7 @@ class SettingsDeleteBrowsingDataTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416041
     @SmokeTest
     @Test
     fun deleteCookiesAndSiteDataTest() {
@@ -226,6 +232,8 @@ class SettingsDeleteBrowsingDataTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/416042
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @SmokeTest
     @Test
     fun deleteCachedFilesTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt
index 3fb4a0be9..8e4c16577 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt
@@ -53,8 +53,9 @@ class SettingsGeneralTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092697
     @Test
-    fun settingsGeneralItemsTests() {
+    fun verifyGeneralSettingsItemsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -76,9 +77,10 @@ class SettingsGeneralTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/344213
     @SmokeTest
     @Test
-    fun changeAccessibiltySettings() {
+    fun verifyFontSizingChangeTest() {
         // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed.
         val fenixApp = activityIntentTestRule.activity.applicationContext as FenixApplication
         val webpage = getLoremIpsumAsset(mockWebServer).url
@@ -107,9 +109,10 @@ class SettingsGeneralTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516079
     @SmokeTest
     @Test
-    fun switchLanguageTest() {
+    fun setAppLanguageDifferentThanSystemLanguageTest() {
         val enLanguageHeaderText = getStringResource(R.string.preferences_language)
 
         homeScreen {
@@ -132,6 +135,7 @@ class SettingsGeneralTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516080
     @Test
     fun searchInLanguagesListTest() {
         val systemLocaleDefault = getStringResource(R.string.default_locale_text)
@@ -153,10 +157,11 @@ class SettingsGeneralTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516078
     // Because it requires changing system prefs, this test will run only on Debug builds
     @Ignore("Failing due to app translation bug, see: https://github.com/mozilla-mobile/fenix/issues/26729")
     @Test
-    fun frenchSystemLocaleTest() {
+    fun verifyFollowDeviceLanguageTest() {
         val frenchLocale = Locale("fr", "FR")
 
         runWithSystemLocaleChanged(frenchLocale, activityIntentTestRule) {
@@ -172,47 +177,18 @@ class SettingsGeneralTest {
         }
     }
 
-    @SmokeTest
-    @Test
-    fun verifyHomepageOptionSummaryUpdatesTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsOptionSummary("Homepage", "Open on homepage after four hours")
-        }.openHomepageSubMenu {
-            verifySelectedOpeningScreenOption("Homepage after four hours of inactivity")
-            clickOpeningScreenOption("Homepage")
-            verifySelectedOpeningScreenOption("Homepage")
-        }.goBack {
-            verifySettingsOptionSummary("Homepage", "Open on homepage")
-        }.openHomepageSubMenu {
-            clickOpeningScreenOption("Last tab")
-            verifySelectedOpeningScreenOption("Last tab")
-        }.goBack {
-            verifySettingsOptionSummary("Homepage", "Open on last tab")
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1360557
     @Test
     fun tabsSettingsMenuItemsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
+            verifyTabsButton()
+            verifySettingsOptionSummary("Tabs", "Close manually")
         }.openTabsSubMenu {
             verifyTabViewOptions()
             verifyCloseTabsOptions()
             verifyMoveOldTabsToInactiveOptions()
-        }
-    }
-
-    @Test
-    fun verifyTabsOptionSummaryUpdatesTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyTabsButton()
-            verifySettingsOptionSummary("Tabs", "Close manually")
-        }.openTabsSubMenu {
             verifySelectedCloseTabsOption("Never")
             clickClosedTabsOption("After one day")
             verifySelectedCloseTabsOption("After one day")
@@ -230,4 +206,21 @@ class SettingsGeneralTest {
             verifySettingsOptionSummary("Tabs", "Close after one month")
         }
     }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243583
+    // For API>23
+    // Verifies the default browser switch opens the system default apps menu.
+    @SmokeTest
+    @Test
+    fun changeDefaultBrowserSetting() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifyDefaultBrowserToggle(false)
+            clickDefaultBrowserSwitch()
+            verifyAndroidDefaultAppsMenuAppears()
+        }
+        // Dismiss the request
+        mDevice.pressBack()
+    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt
index 4280aa24f..05d754c4f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt
@@ -32,6 +32,7 @@ class SettingsHTTPSOnlyModeTest {
     @get:Rule
     val activityTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1724825
     @Test
     fun httpsOnlyModeMenuItemsTest() {
         homeScreen {
@@ -58,6 +59,7 @@ class SettingsHTTPSOnlyModeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1724827
     @SmokeTest
     @Test
     fun httpsOnlyModeEnabledInNormalBrowsingTest() {
@@ -93,8 +95,9 @@ class SettingsHTTPSOnlyModeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2091057
     @Test
-    fun httpsOnlyModeExceptionPersistsForCurrentSession() {
+    fun httpsOnlyModeExceptionPersistsForCurrentSessionTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -120,6 +123,7 @@ class SettingsHTTPSOnlyModeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1724828
     @Test
     fun httpsOnlyModeEnabledOnlyInPrivateBrowsingTest() {
         homeScreen {
@@ -159,6 +163,7 @@ class SettingsHTTPSOnlyModeTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2091058
     @Test
     fun turnOffHttpsOnlyModeTest() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
index 4f0fa2247..769add7bf 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
@@ -49,6 +49,7 @@ class SettingsHomepageTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564843
     @Test
     fun verifyHomepageSettingsTest() {
         homeScreen {
@@ -59,6 +60,7 @@ class SettingsHomepageTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564859
     @Test
     fun verifyShortcutOptionTest() {
         // en-US defaults
@@ -90,6 +92,7 @@ class SettingsHomepageTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1565003
     @Test
     fun verifyRecentlyVisitedOptionTest() {
         activityIntentTestRule.applySettingsExceptions {
@@ -109,26 +112,7 @@ class SettingsHomepageTest {
         }
     }
 
-    @Test
-    fun verifyPocketOptionTest() {
-        activityIntentTestRule.applySettingsExceptions {
-            it.isRecentTabsFeatureEnabled = false
-            it.isRecentlyVisitedFeatureEnabled = false
-        }
-        val genericURL = getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-        }.goToHomescreen {
-            verifyPocketSectionIsDisplayed()
-        }.openThreeDotMenu {
-        }.openCustomizeHome {
-            clickPocketButton()
-        }.goBackToHomeScreen {
-            verifyPocketSectionIsNotDisplayed()
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564999
     @SmokeTest
     @Test
     fun jumpBackInOptionTest() {
@@ -146,6 +130,7 @@ class SettingsHomepageTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1565000
     @SmokeTest
     @Test
     fun recentBookmarksOptionTest() {
@@ -165,48 +150,47 @@ class SettingsHomepageTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569831
     @SmokeTest
     @Test
-    fun startOnHomepageTest() {
+    fun verifyOpeningScreenOptionsTest() {
         val genericURL = getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(genericURL.url) {
         }.openThreeDotMenu {
         }.openSettings {
+            verifySettingsOptionSummary("Homepage", "Open on homepage after four hours")
         }.openHomepageSubMenu {
+            verifySelectedOpeningScreenOption("Homepage after four hours of inactivity")
             clickOpeningScreenOption("Homepage")
+            verifySelectedOpeningScreenOption("Homepage")
         }
 
         restartApp(activityIntentTestRule)
 
         homeScreen {
             verifyHomeScreen()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun startOnLastTabTest() {
-        val firstWebPage = getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-        }.goToHomescreen {
         }.openThreeDotMenu {
-        }.openCustomizeHome {
+        }.openSettings {
+            verifySettingsOptionSummary("Homepage", "Open on homepage")
+        }.openHomepageSubMenu {
             clickOpeningScreenOption("Last tab")
+            verifySelectedOpeningScreenOption("Last tab")
+        }.goBack {
+            verifySettingsOptionSummary("Homepage", "Open on last tab")
         }
 
         restartApp(activityIntentTestRule)
 
         browserScreen {
-            verifyUrl(firstWebPage.url.toString())
+            verifyUrl(genericURL.url.toString())
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569843
     @Test
-    fun ignoreStartOnHomeWhenLaunchedByExternalLinkTest() {
+    fun verifyOpeningScreenAfterLaunchingExternalLinkTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
 
         homeScreen {
@@ -230,9 +214,10 @@ class SettingsHomepageTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1676359
     @Ignore("Intermittent test: https://github.com/mozilla-mobile/fenix/issues/26559")
     @Test
-    fun setWallpaperTest() {
+    fun verifyWallpaperChangeTest() {
         val wallpapers = listOf(
             "Wallpaper Item: amethyst",
             "Wallpaper Item: cerulean",
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
index e182fd593..c70c75df6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
@@ -44,6 +44,7 @@ class SettingsPrivacyTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092698
     @Test
     fun settingsPrivacyItemsTest() {
         homeScreen {
@@ -68,8 +69,9 @@ class SettingsPrivacyTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243362
     @Test
-    fun verifyDataCollectionTest() {
+    fun verifyDataCollectionSettingsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -79,44 +81,14 @@ class SettingsPrivacyTest {
                 true,
                 "On",
             )
-        }
-    }
-
-    @Test
-    fun verifyUsageAndTechnicalDataToggleTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openSettingsSubMenuDataCollection {
-            verifyUsageAndTechnicalDataToggle(true)
             clickUsageAndTechnicalDataToggle()
             verifyUsageAndTechnicalDataToggle(false)
-        }
-    }
-
-    @Test
-    fun verifyMarketingDataToggleTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openSettingsSubMenuDataCollection {
-            verifyMarketingDataToggle(true)
+            clickUsageAndTechnicalDataToggle()
+            verifyUsageAndTechnicalDataToggle(true)
             clickMarketingDataToggle()
             verifyMarketingDataToggle(false)
-        }
-    }
-
-    @Test
-    fun verifyStudiesToggleTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openSettingsSubMenuDataCollection {
-            verifyDataCollectionView(
-                true,
-                true,
-                "On",
-            )
+            clickMarketingDataToggle()
+            verifyMarketingDataToggle(true)
             clickStudiesOption()
             verifyStudiesToggle(true)
             clickStudiesToggle()
@@ -126,26 +98,7 @@ class SettingsPrivacyTest {
         }
     }
 
-    @Test
-    fun sitePermissionsItemsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openSettingsSubMenuSitePermissions {
-            verifySitePermissionsToolbarTitle()
-            verifyToolbarGoBackButton()
-            verifySitePermissionOption("Autoplay", "Block audio only")
-            verifySitePermissionOption("Camera", "Blocked by Android")
-            verifySitePermissionOption("Location", "Blocked by Android")
-            verifySitePermissionOption("Microphone", "Blocked by Android")
-            verifySitePermissionOption("Notification", "Ask to allow")
-            verifySitePermissionOption("Persistent Storage", "Ask to allow")
-            verifySitePermissionOption("Cross-site cookies", "Ask to allow")
-            verifySitePermissionOption("DRM-controlled content", "Ask to allow")
-            verifySitePermissionOption("Exceptions")
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1024594
     @Test
     fun verifyNotificationsSettingsTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt
index 429de0091..6b2102e93 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt
@@ -39,6 +39,7 @@ class SettingsPrivateBrowsingTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/555822
     @Test
     fun verifyPrivateBrowsingMenuItemsTest() {
         homeScreen {
@@ -145,8 +146,9 @@ class SettingsPrivateBrowsingTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/414583
     @Test
-    fun addPrivateBrowsingShortcut() {
+    fun addPrivateBrowsingShortcutFromSettingsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
index c1df13e1f..600b77aca 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
@@ -160,7 +160,7 @@ class SettingsSearchTest {
         homeScreen {
         }.openSearch {
             typeSearch("test")
-            verifyNoSuggestionsAreDisplayed(
+            verifySuggestionsAreNotDisplayed(
                 activityTestRule,
                 "Firefox Suggest",
                 websiteURL,
@@ -188,7 +188,7 @@ class SettingsSearchTest {
         homeScreen {
         }.openSearch {
             typeSearch("test")
-            verifyNoSuggestionsAreDisplayed(
+            verifySuggestionsAreNotDisplayed(
                 activityTestRule,
                 "Firefox Suggest",
                 website.title,
@@ -426,7 +426,7 @@ class SettingsSearchTest {
         }.goBack {
         }.openSearch {
             typeSearch("mozilla")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, "mozilla firefox")
+            verifySuggestionsAreNotDisplayed(activityTestRule, "mozilla firefox")
         }
     }
 
@@ -439,7 +439,7 @@ class SettingsSearchTest {
             typeSearch("mozilla")
             verifyAllowSuggestionsInPrivateModeDialog()
             denySuggestionsInPrivateMode()
-            verifyNoSuggestionsAreDisplayed(activityTestRule, "mozilla firefox")
+            verifySuggestionsAreNotDisplayed(activityTestRule, "mozilla firefox")
         }
     }
 
@@ -466,7 +466,7 @@ class SettingsSearchTest {
         }.goBack {
         }.openSearch {
             typeSearch("mozilla")
-            verifyNoSuggestionsAreDisplayed(activityTestRule, "mozilla firefox")
+            verifySuggestionsAreNotDisplayed(activityTestRule, "mozilla firefox")
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
index d73d92b6d..42dd55e85 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
@@ -69,11 +69,33 @@ class SettingsSitePermissionsTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246974
+    @Test
+    fun sitePermissionsItemsTest() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.openSettingsSubMenuSitePermissions {
+            verifySitePermissionsToolbarTitle()
+            verifyToolbarGoBackButton()
+            verifySitePermissionOption("Autoplay", "Block audio only")
+            verifySitePermissionOption("Camera", "Blocked by Android")
+            verifySitePermissionOption("Location", "Blocked by Android")
+            verifySitePermissionOption("Microphone", "Blocked by Android")
+            verifySitePermissionOption("Notification", "Ask to allow")
+            verifySitePermissionOption("Persistent Storage", "Ask to allow")
+            verifySitePermissionOption("Cross-site cookies", "Ask to allow")
+            verifySitePermissionOption("DRM-controlled content", "Ask to allow")
+            verifySitePermissionOption("Exceptions")
+        }
+    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247680
     // Verifies that you can go to System settings and change app's permissions from inside the app
     @SmokeTest
     @Test
     @SdkSuppress(minSdkVersion = 29)
-    fun redirectToAppPermissionsSystemSettingsTest() {
+    fun systemBlockedPermissionsRedirectToSystemAppSettingsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
@@ -108,9 +130,10 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2095125
     @SmokeTest
     @Test
-    fun verifyAutoplayBlockAudioOnlySettingTest() {
+    fun verifyAutoplayBlockAudioOnlySettingOnNotMutedVideoTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
         val videoTestPage = getVideoPageAsset(mockWebServer)
 
@@ -146,6 +169,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2286807
     @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1827599")
     @SmokeTest
     @Test
@@ -173,8 +197,9 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2095124
     @Test
-    fun verifyAutoplayAllowAudioVideoSettingTest() {
+    fun verifyAutoplayAllowAudioVideoSettingOnNotMutedVideoTestTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
         val videoTestPage = getVideoPageAsset(mockWebServer)
 
@@ -208,6 +233,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2286806
     @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1827599")
     @Test
     fun verifyAutoplayAllowAudioVideoSettingOnMutedVideoTest() {
@@ -235,8 +261,9 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2095126
     @Test
-    fun verifyAutoplayBlockAudioAndVideoSettingTest() {
+    fun verifyAutoplayBlockAudioAndVideoSettingOnNotMutedVideoTest() {
         val videoTestPage = getVideoPageAsset(mockWebServer)
 
         homeScreen {
@@ -265,6 +292,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2286808
     @Test
     fun verifyAutoplayBlockAudioAndVideoSettingOnMutedVideoTest() {
         val mutedVideoTestPage = getMutedVideoPageAsset(mockWebServer)
@@ -294,6 +322,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247362
     @Test
     fun verifyCameraPermissionSettingsTest() {
         navigationToolbar {
@@ -319,6 +348,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247364
     @Test
     fun verifyMicrophonePermissionSettingsTest() {
         navigationToolbar {
@@ -344,6 +374,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247363
     @Test
     fun verifyLocationPermissionSettingsTest() {
         navigationToolbar {
@@ -368,6 +399,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247365
     @Test
     fun verifyNotificationsPermissionSettingsTest() {
         navigationToolbar {
@@ -392,6 +424,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1923415
     @Test
     fun verifyPersistentStoragePermissionSettingsTest() {
         navigationToolbar {
@@ -416,6 +449,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1923417
     @Ignore("Flaky, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1829889")
     @Test
     fun verifyDRMControlledContentPermissionSettingsTest() {
@@ -454,6 +488,7 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246976
     @SmokeTest
     @Test
     fun clearAllSitePermissionsExceptionsTest() {
@@ -476,8 +511,9 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/247007
     @Test
-    fun clearOneSiteAllPermissionsExceptionsTest() {
+    fun addAndClearOneWebPagePermission() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(permissionsTestPage.toUri()) {
         }.clickOpenNotificationButton {
@@ -498,8 +534,9 @@ class SettingsSitePermissionsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/326477
     @Test
-    fun clearOneSiteOnePermissionExceptionTest() {
+    fun clearIndividuallyAWebPagePermission() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(permissionsTestPage.toUri()) {
         }.clickOpenNotificationButton {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 485918e56..c73980860 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -1,380 +1,236 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@file:Suppress("DEPRECATION")
-
-package org.mozilla.fenix.ui
-
-import android.view.View
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.core.net.toUri
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
-import androidx.test.uiautomator.UiDevice
-import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.concept.engine.mediasession.MediaSession
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.mozilla.fenix.IntentReceiverActivity
-import org.mozilla.fenix.R
-import org.mozilla.fenix.customannotations.SmokeTest
-import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
-import org.mozilla.fenix.helpers.RetryTestRule
-import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.assertYoutubeAppOpens
-import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
-import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
-import org.mozilla.fenix.ui.robots.browserScreen
-import org.mozilla.fenix.ui.robots.clickPageObject
-import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.navigationToolbar
-
-/**
- * Test Suite that contains a part of the Smoke and Sanity tests defined in TestRail:
- * https://testrail.stage.mozaws.net/index.php?/suites/view/3192
- * Other smoke tests have been marked with the @SmokeTest annotation throughout the ui package in order to limit this class expansion.
- * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
- */
-@Suppress("ForbiddenComment")
-@SmokeTest
-class SmokeTest {
-    private lateinit var mDevice: UiDevice
-    private lateinit var mockWebServer: MockWebServer
-    private lateinit var browserStore: BrowserStore
-
-    @get:Rule(order = 0)
-    val activityTestRule = AndroidComposeTestRule(
-        HomeActivityIntentTestRule.withDefaultSettingsOverrides(),
-        { it.activity },
-    )
-
-    @get: Rule(order = 1)
-    val intentReceiverActivityTestRule = ActivityTestRule(
-        IntentReceiverActivity::class.java,
-        true,
-        false,
-    )
-
-    @Rule(order = 2)
-    @JvmField
-    val retryTestRule = RetryTestRule(3)
-
-    @Before
-    fun setUp() {
-        // Initializing this as part of class construction, below the rule would throw a NPE
-        // So we are initializing this here instead of in all related tests.
-        browserStore = activityTestRule.activity.components.core.store
-
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
-    // Device or AVD requires a Google Services Android OS installation with Play Store installed
-    // Verifies the Open in app button when an app is installed
-    @Test
-    fun mainMenuOpenInAppTest() {
-        val youtubeURL = "vnd.youtube://".toUri()
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(youtubeURL) {
-            verifyNotificationDotOnMainMenu()
-        }.openThreeDotMenu {
-        }.clickOpenInApp {
-            assertYoutubeAppOpens()
-        }
-    }
-
-    // Verifies that deleting a Bookmarks folder also removes the item from inside it.
-    @Test
-    fun deleteNonEmptyBookmarkFolderTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        browserScreen {
-            createBookmark(website.url)
-        }.openThreeDotMenu {
-        }.openBookmarks {
-            verifyBookmarkTitle("Test_Page_1")
-            createFolder("My Folder")
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("Test_Page_1") {
-        }.clickEdit {
-            clickParentFolderSelector()
-            selectFolder("My Folder")
-            navigateUp()
-            saveEditBookmark()
-            createFolder("My Folder 2")
-            verifyFolderTitle("My Folder 2")
-        }.openThreeDotMenu("My Folder 2") {
-        }.clickEdit {
-            clickParentFolderSelector()
-            selectFolder("My Folder")
-            navigateUp()
-            saveEditBookmark()
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            cancelFolderDeletion()
-            verifyFolderTitle("My Folder")
-        }.openThreeDotMenu("My Folder") {
-        }.clickDelete {
-            confirmDeletion()
-            verifyDeleteSnackBarText()
-            verifyBookmarkIsDeleted("My Folder")
-            verifyBookmarkIsDeleted("My Folder 2")
-            verifyBookmarkIsDeleted("Test_Page_1")
-            navigateUp()
-        }
-
-        browserScreen {
-        }.openThreeDotMenu {
-            verifyAddBookmarkButton()
-        }
-    }
-
-    @Test
-    fun shareTabsFromTabsTrayTest() {
-        val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-        val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2)
-        val firstWebsiteTitle = firstWebsite.title
-        val secondWebsiteTitle = secondWebsite.title
-        val sharingApp = "Gmail"
-        val sharedUrlsString = "${firstWebsite.url}\n\n${secondWebsite.url}"
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebsite.url) {
-            verifyPageContent(firstWebsite.content)
-        }.openTabDrawer {
-        }.openNewTab {
-        }.submitQuery(secondWebsite.url.toString()) {
-            verifyPageContent(secondWebsite.content)
-        }.openTabDrawer {
-            verifyExistingOpenTabs("Test_Page_1")
-            verifyExistingOpenTabs("Test_Page_2")
-        }.openTabsListThreeDotMenu {
-            verifyShareAllTabsButton()
-        }.clickShareAllTabsButton {
-            verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle)
-            verifySharingWithSelectedApp(
-                sharingApp,
-                sharedUrlsString,
-                "$firstWebsiteTitle, $secondWebsiteTitle",
-            )
-        }
-    }
-
-    @Test
-    fun privateTabsTrayWithOpenedTabTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-        }.openTabDrawer {
-            verifyNormalBrowsingButtonIsSelected(false)
-            verifyPrivateBrowsingButtonIsSelected(true)
-            verifySyncedTabsButtonIsSelected(false)
-            verifyTabTrayOverflowMenu(true)
-            verifyTabsTrayCounter()
-            verifyExistingTabList()
-            verifyExistingOpenTabs(website.title)
-            verifyCloseTabsButton(website.title)
-            verifyOpenedTabThumbnail()
-            verifyPrivateBrowsingNewTabButton()
-        }
-    }
-
-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun noHistoryInPrivateBrowsingTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyEmptyHistoryView()
-        }
-    }
-
-    @Test
-    fun mainMenuInstallPWATest() {
-        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(pwaPage.toUri()) {
-            verifyNotificationDotOnMainMenu()
-        }.openThreeDotMenu {
-        }.clickInstall {
-            clickAddAutomaticallyButton()
-        }.openHomeScreenShortcut("TEST_APP") {
-            mDevice.waitForIdle()
-            verifyNavURLBarHidden()
-        }
-    }
-
-    // Verifies that reader mode is detected and the custom appearance controls are displayed
-    @Test
-    fun verifyReaderViewAppearanceUI() {
-        val readerViewPage =
-            TestAssetHelper.getLoremIpsumAsset(mockWebServer)
-        val estimatedReadingTime = "1 - 2 minutes"
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(readerViewPage.url) {
-            mDevice.waitForIdle()
-        }
-
-        registerAndCleanupIdlingResources(
-            ViewVisibilityIdlingResource(
-                activityTestRule.activity.findViewById(R.id.mozac_browser_toolbar_page_actions),
-                View.VISIBLE,
-            ),
-        ) {}
-
-        navigationToolbar {
-            verifyReaderViewDetected(true)
-            toggleReaderView()
-        }
-
-        browserScreen {
-            waitForPageToLoad()
-            verifyPageContent(estimatedReadingTime)
-        }.openThreeDotMenu {
-            verifyReaderViewAppearance(true)
-        }.openReaderViewAppearance {
-            verifyAppearanceFontGroup(true)
-            verifyAppearanceFontSansSerif(true)
-            verifyAppearanceFontSerif(true)
-            verifyAppearanceFontIncrease(true)
-            verifyAppearanceFontDecrease(true)
-            verifyAppearanceColorGroup(true)
-            verifyAppearanceColorDark(true)
-            verifyAppearanceColorLight(true)
-            verifyAppearanceColorSepia(true)
-        }
-    }
-
-    @Test
-    fun tabMediaControlButtonTest() {
-        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(audioTestPage.url) {
-            mDevice.waitForIdle()
-            clickPageObject(itemWithText("Play"))
-            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
-        }.openTabDrawer {
-            verifyTabMediaControlButtonState("Pause")
-            clickTabMediaControlButton("Pause")
-            verifyTabMediaControlButtonState("Play")
-        }.openTab(audioTestPage.title) {
-            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
-        }
-    }
-
-    // For API>23
-    // Verifies the default browser switch opens the system default apps menu.
-    @Test
-    fun changeDefaultBrowserSetting() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyDefaultBrowserToggle(false)
-            clickDefaultBrowserSwitch()
-            verifyAndroidDefaultAppsMenuAppears()
-        }
-        // Dismiss the request
-        mDevice.pressBack()
-    }
-
-    @Test
-    fun goToHomeScreenBottomToolbarTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenTopToolbarTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCustomizeSubMenu {
-            clickTopToolbarToggle()
-        }.goBack {
-        }.goBack {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenBottomToolbarPrivateModeTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-            togglePrivateBrowsingModeOnOff()
-        }
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-
-    @Test
-    fun goToHomeScreenTopToolbarPrivateModeTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-            togglePrivateBrowsingModeOnOff()
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openCustomizeSubMenu {
-            clickTopToolbarToggle()
-        }.goBack {
-        }.goBack {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            mDevice.waitForIdle()
-        }.goToHomescreen {
-            verifyHomeScreen()
-        }
-    }
-}
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@file:Suppress("DEPRECATION")
+
+package org.mozilla.fenix.ui
+
+import android.view.View
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.core.net.toUri
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.mediasession.MediaSession
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.IntentReceiverActivity
+import org.mozilla.fenix.R
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
+import org.mozilla.fenix.helpers.RetryTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
+import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
+import org.mozilla.fenix.ui.robots.browserScreen
+import org.mozilla.fenix.ui.robots.clickPageObject
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+
+/**
+ * Test Suite that contains a part of the Smoke and Sanity tests defined in TestRail:
+ * https://testrail.stage.mozaws.net/index.php?/suites/view/3192
+ * Other smoke tests have been marked with the @SmokeTest annotation throughout the ui package in order to limit this class expansion.
+ * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
+ */
+@Suppress("ForbiddenComment")
+@SmokeTest
+class SmokeTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+    private lateinit var browserStore: BrowserStore
+
+    @get:Rule(order = 0)
+    val activityTestRule = AndroidComposeTestRule(
+        HomeActivityIntentTestRule.withDefaultSettingsOverrides(),
+        { it.activity },
+    )
+
+    @get: Rule(order = 1)
+    val intentReceiverActivityTestRule = ActivityTestRule(
+        IntentReceiverActivity::class.java,
+        true,
+        false,
+    )
+
+    @Rule(order = 2)
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
+
+    @Before
+    fun setUp() {
+        // Initializing this as part of class construction, below the rule would throw a NPE
+        // So we are initializing this here instead of in all related tests.
+        browserStore = activityTestRule.activity.components.core.store
+
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @Test
+    fun shareTabsFromTabsTrayTest() {
+        val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+        val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2)
+        val firstWebsiteTitle = firstWebsite.title
+        val secondWebsiteTitle = secondWebsite.title
+        val sharingApp = "Gmail"
+        val sharedUrlsString = "${firstWebsite.url}\n\n${secondWebsite.url}"
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(firstWebsite.url) {
+            verifyPageContent(firstWebsite.content)
+        }.openTabDrawer {
+        }.openNewTab {
+        }.submitQuery(secondWebsite.url.toString()) {
+            verifyPageContent(secondWebsite.content)
+        }.openTabDrawer {
+            verifyExistingOpenTabs("Test_Page_1")
+            verifyExistingOpenTabs("Test_Page_2")
+        }.openTabsListThreeDotMenu {
+            verifyShareAllTabsButton()
+        }.clickShareAllTabsButton {
+            verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle)
+            verifySharingWithSelectedApp(
+                sharingApp,
+                sharedUrlsString,
+                "$firstWebsiteTitle, $secondWebsiteTitle",
+            )
+        }
+    }
+
+    @Test
+    fun privateTabsTrayWithOpenedTabTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+        }.openTabDrawer {
+            verifyNormalBrowsingButtonIsSelected(false)
+            verifyPrivateBrowsingButtonIsSelected(true)
+            verifySyncedTabsButtonIsSelected(false)
+            verifyTabTrayOverflowMenu(true)
+            verifyTabsTrayCounter()
+            verifyExistingTabList()
+            verifyExistingOpenTabs(website.title)
+            verifyCloseTabsButton(website.title)
+            verifyOpenedTabThumbnail()
+            verifyPrivateBrowsingNewTabButton()
+        }
+    }
+
+    // Test running on beta/release builds in CI:
+    // caution when making changes to it, so they don't block the builds
+    @Test
+    fun noHistoryInPrivateBrowsingTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+            mDevice.waitForIdle()
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyEmptyHistoryView()
+        }
+    }
+
+    @Test
+    fun mainMenuInstallPWATest() {
+        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(pwaPage.toUri()) {
+            verifyNotificationDotOnMainMenu()
+        }.openThreeDotMenu {
+        }.clickInstall {
+            clickAddAutomaticallyButton()
+        }.openHomeScreenShortcut("TEST_APP") {
+            mDevice.waitForIdle()
+            verifyNavURLBarHidden()
+        }
+    }
+
+    // Verifies that reader mode is detected and the custom appearance controls are displayed
+    @Test
+    fun verifyReaderViewAppearanceUI() {
+        val readerViewPage =
+            TestAssetHelper.getLoremIpsumAsset(mockWebServer)
+        val estimatedReadingTime = "1 - 2 minutes"
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(readerViewPage.url) {
+            mDevice.waitForIdle()
+        }
+
+        registerAndCleanupIdlingResources(
+            ViewVisibilityIdlingResource(
+                activityTestRule.activity.findViewById(R.id.mozac_browser_toolbar_page_actions),
+                View.VISIBLE,
+            ),
+        ) {}
+
+        navigationToolbar {
+            verifyReaderViewDetected(true)
+            toggleReaderView()
+        }
+
+        browserScreen {
+            waitForPageToLoad()
+            verifyPageContent(estimatedReadingTime)
+        }.openThreeDotMenu {
+            verifyReaderViewAppearance(true)
+        }.openReaderViewAppearance {
+            verifyAppearanceFontGroup(true)
+            verifyAppearanceFontSansSerif(true)
+            verifyAppearanceFontSerif(true)
+            verifyAppearanceFontIncrease(true)
+            verifyAppearanceFontDecrease(true)
+            verifyAppearanceColorGroup(true)
+            verifyAppearanceColorDark(true)
+            verifyAppearanceColorLight(true)
+            verifyAppearanceColorSepia(true)
+        }
+    }
+
+    @Test
+    fun tabMediaControlButtonTest() {
+        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(audioTestPage.url) {
+            mDevice.waitForIdle()
+            clickPageObject(itemWithText("Play"))
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PLAYING)
+        }.openTabDrawer {
+            verifyTabMediaControlButtonState("Pause")
+            clickTabMediaControlButton("Pause")
+            verifyTabMediaControlButtonState("Play")
+        }.openTab(audioTestPage.title) {
+            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
+        }
+    }
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt
index 0f6e0522a..28a747d86 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt
@@ -49,6 +49,7 @@ class SponsoredShortcutsTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729331
     // Expected for en-us defaults
     @SmokeTest
     @Test
@@ -67,6 +68,7 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729338
     @Test
     fun openSponsoredShortcutTest() {
         homeScreen {
@@ -76,8 +78,9 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729334
     @Test
-    fun openSponsoredShortcutInPrivateBrowsingTest() {
+    fun openSponsoredShortcutInPrivateTabTest() {
         homeScreen {
             sponsoredShortcutTitle = getSponsoredShortcutTitle(2)
         }.openContextMenuOnSponsoredShortcut(sponsoredShortcutTitle) {
@@ -86,9 +89,10 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729335
     @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/25926")
     @Test
-    fun verifySponsorsAndPrivacyLinkTest() {
+    fun openSponsorsAndYourPrivacyOptionTest() {
         homeScreen {
             sponsoredShortcutTitle = getSponsoredShortcutTitle(2)
         }.openContextMenuOnSponsoredShortcut(sponsoredShortcutTitle) {
@@ -97,9 +101,10 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729336
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1807268")
     @Test
-    fun verifySponsoredShortcutsSettingsOptionTest() {
+    fun openSponsoredShortcutsSettingsOptionTest() {
         homeScreen {
             sponsoredShortcutTitle = getSponsoredShortcutTitle(2)
         }.openContextMenuOnSponsoredShortcut(sponsoredShortcutTitle) {
@@ -108,6 +113,7 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729337
     @Test
     fun verifySponsoredShortcutsDetailsTest() {
         homeScreen {
@@ -119,6 +125,7 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729328
     // 1 sponsored shortcut should be displayed if there are 7 pinned top sites
     @Test
     fun verifySponsoredShortcutsListWithSevenPinnedSitesTest() {
@@ -169,6 +176,7 @@ class SponsoredShortcutsTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1729329
     // No sponsored shortcuts should be displayed if there are 8 pinned top sites
     @Test
     fun verifySponsoredShortcutsListWithEightPinnedSitesTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
deleted file mode 100644
index afa02ef05..000000000
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.ui
-
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.mozilla.fenix.helpers.AndroidAssetDispatcher
-import org.mozilla.fenix.helpers.HomeActivityTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
-import org.mozilla.fenix.helpers.TestAssetHelper
-import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
-import org.mozilla.fenix.ui.robots.clickContextMenuItem
-import org.mozilla.fenix.ui.robots.clickPageObject
-import org.mozilla.fenix.ui.robots.homeScreen
-import org.mozilla.fenix.ui.robots.longClickPageObject
-
-/**
- *  Tests for verifying the main three dot menu options
- *
- */
-
-class ThreeDotMenuMainTest {
-    private lateinit var mockWebServer: MockWebServer
-
-    @get:Rule
-    val activityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
-
-    @Before
-    fun setUp() {
-        mockWebServer = MockWebServer().apply {
-            dispatcher = AndroidAssetDispatcher()
-            start()
-        }
-    }
-
-    @After
-    fun tearDown() {
-        mockWebServer.shutdown()
-    }
-
-    // Verifies the list of items in the homescreen's 3 dot main menu
-    @Test
-    fun homeThreeDotMenuItemsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyHomeThreeDotMainMenuItems(isRequestDesktopSiteEnabled = false)
-        }.openBookmarks {
-            verifyBookmarksMenuView()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryMenuView()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            verifyEmptyDownloadsList()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openAddonsManagerMenu {
-            verifyAddonsItems()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openSyncSignIn {
-            verifyTurnOnSyncMenu()
-        }.goBack {
-            // Desktop toggle
-        }.openThreeDotMenu {
-        }.switchDesktopSiteMode {
-        }
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(isRequestDesktopSiteEnabled = true)
-        }.openWhatsNew {
-            verifyWhatsNewURL()
-        }.goToHomescreen {
-        }.openThreeDotMenu {
-        }.openHelp {
-            verifyHelpUrl()
-        }.goToHomescreen {
-        }.openThreeDotMenu {
-        }.openCustomizeHome {
-            verifyHomePageView()
-        }.goBackToHomeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsView()
-        }
-    }
-
-    // Verifies the list of items in the homescreen's 3 dot main menu in private browsing
-    @Test
-    fun privateHomeThreeDotMenuItemsTest() {
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyHomeThreeDotMainMenuItems(isRequestDesktopSiteEnabled = false)
-        }.openBookmarks {
-            verifyBookmarksMenuView()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyHistoryMenuView()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openDownloadsManager {
-            verifyEmptyDownloadsList()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openAddonsManagerMenu {
-            verifyAddonsItems()
-        }.goBack {
-        }.openThreeDotMenu {
-        }.openSyncSignIn {
-            verifyTurnOnSyncMenu()
-        }.goBack {
-            // Desktop toggle
-        }.openThreeDotMenu {
-        }.switchDesktopSiteMode {
-        }
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(isRequestDesktopSiteEnabled = true)
-        }.openWhatsNew {
-            verifyWhatsNewURL()
-        }.goToHomescreen {
-        }.openThreeDotMenu {
-        }.openHelp {
-            verifyHelpUrl()
-        }.goToHomescreen {
-        }.openThreeDotMenu {
-        }.openCustomizeHome {
-            verifyHomePageView()
-        }.goBackToHomeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsView()
-        }
-    }
-
-    @Test
-    fun setDesktopSiteBeforePageLoadTest() {
-        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
-
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(false)
-        }.switchDesktopSiteMode {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(webPage.url) {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(true)
-        }.closeBrowserMenuToBrowser {
-            clickPageObject(itemContainingText("Link 1"))
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(true)
-        }.closeBrowserMenuToBrowser {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(webPage.url) {
-            longClickPageObject(itemWithText("Link 2"))
-            clickContextMenuItem("Open link in new tab")
-            clickSnackbarButton("SWITCH")
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(false)
-        }
-    }
-
-    @Test
-    fun privateBrowsingSetDesktopSiteBeforePageLoadTest() {
-        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(false)
-        }.switchDesktopSiteMode {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(webPage.url) {
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(true)
-        }.closeBrowserMenuToBrowser {
-            clickPageObject(itemContainingText("Link 1"))
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(true)
-        }.closeBrowserMenuToBrowser {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(webPage.url) {
-            longClickPageObject(itemWithText("Link 2"))
-            clickContextMenuItem("Open link in private tab")
-            clickSnackbarButton("SWITCH")
-        }.openThreeDotMenu {
-            verifyDesktopSiteModeEnabled(false)
-        }
-    }
-}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
index d1ceacf79..5712d4ebd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
@@ -16,7 +16,6 @@ import org.mozilla.fenix.customannotations.SmokeTest
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.Constants.defaultTopSitesList
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
-import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.generateRandomString
@@ -42,9 +41,6 @@ class TopSitesTest {
     @get:Rule
     val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides(skipOnboarding = true)
 
-    @get:Rule
-    val retryTestRule = RetryTestRule(3)
-
     @Before
     fun setUp() {
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
@@ -218,8 +214,6 @@ class TopSitesTest {
     // Expected for en-us defaults
     @Test
     fun verifyDefaultTopSitesList() {
-        homeScreen { }.dismissOnboarding()
-
         homeScreen {
             verifyExistingTopSitesList()
             defaultTopSitesList.values.forEach { value ->
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TotalCookieProtectionTest.kt
similarity index 56%
rename from app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt
rename to app/src/androidTest/java/org/mozilla/fenix/ui/TotalCookieProtectionTest.kt
index f43eacb5f..c2bd3acf2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TotalCookieProtectionTest.kt
@@ -4,19 +4,16 @@
 
 package org.mozilla.fenix.ui
 
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
-import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
-import org.mozilla.fenix.helpers.MatcherHelper.itemWithDescription
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
-import org.mozilla.fenix.helpers.TestHelper.getStringResource
-import org.mozilla.fenix.ui.robots.clickPageObject
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
@@ -24,17 +21,16 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
  *  Note: This involves setting the feature flags On for CFRs which are disabled elsewhere.
  *
  */
-class ContextualHintsTest {
+class TotalCookieProtectionTest {
     private lateinit var mockWebServer: MockWebServer
 
     @get:Rule
-    val activityTestRule = HomeActivityTestRule(
-        isJumpBackInCFREnabled = true,
-        isTCPCFREnabled = true,
-        isPocketEnabled = false,
-        isRecentlyVisitedFeatureEnabled = false,
-        isCookieBannerReductionDialogEnabled = false,
-    )
+    val composeTestRule = AndroidComposeTestRule(
+        HomeActivityTestRule(
+            isTCPCFREnabled = true,
+            isCookieBannerReductionDialogEnabled = false,
+        ),
+    ) { it.activity }
 
     @Before
     fun setUp() {
@@ -49,27 +45,33 @@ class ContextualHintsTest {
         mockWebServer.shutdown()
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2260552
     @Test
     fun openTotalCookieProtectionLearnMoreLinkTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericPage.url) {
-            verifyCookiesProtectionHintIsDisplayed(true)
-            clickPageObject(itemContainingText(getStringResource(R.string.tcp_cfr_learn_more)))
+        }.enterURLAndEnterToBrowserForTCPCFR(genericPage.url) {
+            waitForPageToLoad()
+            verifyCookiesProtectionHintIsDisplayed(composeTestRule, true)
+            clickTCPCFRLearnMore(composeTestRule)
             verifyUrl("support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-android")
+            verifyShouldShowCFRTCP(false, composeTestRule.activity.settings())
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1913589
     @Test
     fun dismissTotalCookieProtectionHintTest() {
         val genericPage = getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericPage.url) {
-            verifyCookiesProtectionHintIsDisplayed(true)
-            clickPageObject(itemWithDescription(getStringResource(R.string.mozac_cfr_dismiss_button_content_description)))
-            verifyCookiesProtectionHintIsDisplayed(false)
+        }.enterURLAndEnterToBrowserForTCPCFR(genericPage.url) {
+            waitForPageToLoad()
+            verifyCookiesProtectionHintIsDisplayed(composeTestRule, true)
+            dismissTCPCFRPopup(composeTestRule)
+            verifyCookiesProtectionHintIsDisplayed(composeTestRule, false)
+            verifyShouldShowCFRTCP(false, composeTestRule.activity.settings())
         }
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
index 7f98007af..13bd3f9af 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt
@@ -5,23 +5,21 @@
 package org.mozilla.fenix.ui.robots
 
 import android.os.Build
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.junit.Assert.assertTrue
-import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemContainingTextExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.click
 import java.util.regex.Pattern
 
 /**
@@ -29,11 +27,14 @@ import java.util.regex.Pattern
  */
 class AddToHomeScreenRobot {
 
-    fun verifyAddPrivateBrowsingShortcutButton() = assertAddPrivateBrowsingShortcutButton()
+    fun verifyAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+        composeTestRule.onNodeWithTag("private.add").assertIsDisplayed()
 
-    fun verifyNoThanksPrivateBrowsingShortcutButton() = assertNoThanksPrivateBrowsingShortcutButton()
+    fun verifyNoThanksPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+        composeTestRule.onNodeWithTag("private.cancel").assertIsDisplayed()
 
-    fun clickAddPrivateBrowsingShortcutButton() = addPrivateBrowsingShortcutButton().click()
+    fun clickAddPrivateBrowsingShortcutButton(composeTestRule: ComposeTestRule) =
+        composeTestRule.onNodeWithTag("private.add").performClick()
 
     fun addShortcutName(title: String) = shortcutTextField.setText(title)
 
@@ -104,16 +105,6 @@ fun addToHomeScreen(interact: AddToHomeScreenRobot.() -> Unit): AddToHomeScreenR
 private fun addAutomaticallyButton() =
     mDevice.findObject(UiSelector().textContains("add automatically"))
 
-private fun addPrivateBrowsingShortcutButton() = onView(withId(R.id.cfr_pos_button))
-
-private fun assertAddPrivateBrowsingShortcutButton() = addPrivateBrowsingShortcutButton()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-private fun noThanksPrivateBrowsingShortcutButton() = onView(withId(R.id.cfr_neg_button))
-
-private fun assertNoThanksPrivateBrowsingShortcutButton() = noThanksPrivateBrowsingShortcutButton()
-    .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
 private val cancelAddToHomeScreenButton =
     itemWithResId("$packageName:id/cancel_button")
 private val confirmAddToHomeScreenButton =
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
index 9d3e78074..f82de65c0 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt
@@ -188,6 +188,13 @@ class BookmarksRobot {
         addFolderButton().click()
     }
 
+    fun clickAddNewFolderButtonFromSelectFolderView() =
+        itemWithResId("$packageName:id/add_folder_button")
+            .also {
+                it.waitForExists(waitingTime)
+                it.click()
+            }
+
     fun addNewFolderName(name: String) {
         addFolderTitleField()
             .click()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index c9e1d4ebf..ebd651562 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -11,7 +11,9 @@ import android.net.Uri
 import android.os.SystemClock
 import android.util.Log
 import android.widget.TimePicker
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -41,7 +43,6 @@ import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
 import org.mozilla.fenix.helpers.Constants.RETRY_COUNT
 import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemContainingTextExists
-import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithDescriptionExists
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdAndTextExists
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -60,6 +61,7 @@ import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.TestHelper.waitForObjects
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.tabstray.TabsTrayTestTag
+import org.mozilla.fenix.utils.Settings
 import java.time.LocalDate
 
 class BrowserRobot {
@@ -190,11 +192,11 @@ class BrowserRobot {
         )
     }
 
-    fun verifyContextMenuForLinksToOtherApps(containsURL: Uri) {
+    fun verifyContextMenuForLinksToOtherApps(containsURL: String) {
         // If the link is re-directing to an external app the "Open link in external app" option is available
         // If the link is not directing to another local asset the "Download link" option is not available
         assertItemContainingTextExists(
-            contextMenuLinkUrl(containsURL.toString()),
+            contextMenuLinkUrl(containsURL),
             contextMenuOpenLinkInNewTab,
             contextMenuOpenLinkInPrivateTab,
             contextMenuCopyLink,
@@ -249,15 +251,6 @@ class BrowserRobot {
 
     fun verifyMenuButton() = threeDotButton().check(matches(isDisplayed()))
 
-    fun verifyNavURLBarItems() {
-        navURLBar().waitForExists(waitingTime)
-        verifyMenuButton()
-        verifyTabCounter("1")
-        verifySearchBar()
-        verifySecureConnectionLockIcon()
-        verifyHomeScreenButton()
-    }
-
     fun verifyNoLinkImageContextMenuItems(containsURL: Uri) {
         mDevice.waitNotNull(Until.findObject(By.textContains(containsURL.toString())))
         mDevice.waitNotNull(
@@ -590,16 +583,32 @@ class BrowserRobot {
         }
     }
 
-    fun verifyCookiesProtectionHintIsDisplayed(isDisplayed: Boolean) {
-        assertItemContainingTextExists(
-            totalCookieProtectionHintMessage,
-            totalCookieProtectionHintLearnMoreLink,
-            exists = isDisplayed,
-        )
-        assertItemWithDescriptionExists(
-            totalCookieProtectionHintCloseButton,
-            exists = isDisplayed,
-        )
+    fun verifyCookiesProtectionHintIsDisplayed(composeTestRule: HomeActivityComposeTestRule, isDisplayed: Boolean) {
+        if (isDisplayed) {
+            composeTestRule.onNodeWithTag("tcp_cfr.message").assertIsDisplayed()
+            composeTestRule.onNodeWithTag("tcp_cfr.action").assertIsDisplayed()
+            composeTestRule.onNodeWithTag("cfr.dismiss").assertIsDisplayed()
+        } else {
+            composeTestRule.onNodeWithTag("tcp_cfr.message").assertDoesNotExist()
+            composeTestRule.onNodeWithTag("tcp_cfr.action").assertDoesNotExist()
+            composeTestRule.onNodeWithTag("cfr.dismiss").assertDoesNotExist()
+        }
+    }
+
+    fun clickTCPCFRLearnMore(composeTestRule: HomeActivityComposeTestRule) {
+        composeTestRule.onNodeWithTag("tcp_cfr.action").performClick()
+    }
+
+    fun dismissTCPCFRPopup(composeTestRule: HomeActivityComposeTestRule) {
+        composeTestRule.onNodeWithTag("cfr.dismiss").performClick()
+    }
+
+    fun verifyShouldShowCFRTCP(shouldShow: Boolean, settings: Settings) {
+        if (shouldShow) {
+            assertTrue(settings.shouldShowTotalCookieProtectionCFR)
+        } else {
+            assertFalse(settings.shouldShowTotalCookieProtectionCFR)
+        }
     }
 
     fun selectTime(hour: Int, minute: Int) =
@@ -873,6 +882,17 @@ class BrowserRobot {
         assertTrue(button.waitForExists(waitingTime))
     }
 
+    fun verifySurveyNoThanksButton() {
+        val button = mDevice.findObject(
+            UiSelector().text(
+                getStringResource(
+                    R.string.preferences_not_take_survey,
+                ),
+            ),
+        )
+        assertTrue(button.waitForExists(waitingTime))
+    }
+
     fun clickOpenLinksInAppsDismissCFRButton() =
         itemWithResIdContainingText(
             "$packageName:id/dismiss",
@@ -891,6 +911,18 @@ class BrowserRobot {
         button.click()
     }
 
+    fun clickNoThanksSurveyButton() {
+        val button = mDevice.findObject(
+            UiSelector().text(
+                getStringResource(
+                    R.string.preferences_not_take_survey,
+                ),
+            ),
+        )
+        button.waitForExists(waitingTime)
+        button.click()
+    }
+
     fun longClickToolbar() = mDevice.findObject(By.res("$packageName:id/mozac_browser_toolbar_url_view")).click(LONG_CLICK_DURATION)
 
     fun verifyDownloadPromptIsDismissed() =
@@ -1066,6 +1098,21 @@ class BrowserRobot {
             return HomeScreenRobot.Transition()
         }
 
+        fun goToHomescreenWithComposeTopSites(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTopSitesRobot.() -> Unit): ComposeTopSitesRobot.Transition {
+            clickPageObject(itemWithDescription("Home screen"))
+
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout"))
+                .waitForExists(waitingTime) ||
+                mDevice.findObject(
+                    UiSelector().text(
+                        getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2),
+                    ),
+                ).waitForExists(waitingTime)
+
+            ComposeTopSitesRobot(composeTestRule).interact()
+            return ComposeTopSitesRobot.Transition(composeTestRule)
+        }
+
         fun goBack(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
             mDevice.pressBack()
 
@@ -1211,6 +1258,14 @@ class BrowserRobot {
             BrowserRobot().interact()
             return Transition()
         }
+
+        fun clickNoThanksSurveyButton(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
+            surveyNoThanksButton.waitForExists(waitingTime)
+            surveyNoThanksButton.click()
+
+            BrowserRobot().interact()
+            return Transition()
+        }
     }
 }
 
@@ -1331,12 +1386,6 @@ private val currentDay = currentDate.dayOfMonth
 private val currentMonth = currentDate.month
 private val currentYear = currentDate.year
 private val cookieBanner = itemWithResId("startsiden-gdpr-disclaimer")
-private val totalCookieProtectionHintMessage =
-    itemContainingText(getStringResource(R.string.tcp_cfr_message))
-private val totalCookieProtectionHintLearnMoreLink =
-    itemContainingText(getStringResource(R.string.tcp_cfr_learn_more))
-private val totalCookieProtectionHintCloseButton =
-    itemWithDescription(getStringResource(R.string.mozac_cfr_dismiss_button_content_description))
 
 // Context menu items
 // Link URL
@@ -1369,3 +1418,6 @@ private val contextMenuOpenInExternalApp =
 
 private val surveyButton =
     itemContainingText(getStringResource(R.string.preferences_take_survey))
+
+private val surveyNoThanksButton =
+    itemContainingText(getStringResource(R.string.preferences_not_take_survey))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
index 4193c06a8..e163d8f74 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTabDrawerRobot.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.test.assertIsNotSelected
 import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.filter
 import androidx.compose.ui.test.hasAnyChild
+import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasParent
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
@@ -272,7 +273,9 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     /**
      * Verifies a tab's media button matches [action] when there is only one tab with media.
      */
+    @OptIn(ExperimentalTestApi::class)
     fun verifyTabMediaControlButtonState(action: String) {
+        composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
         composeTestRule.tabMediaControlButton(action)
             .assertExists()
     }
@@ -280,7 +283,9 @@ class ComposeTabDrawerRobot(private val composeTestRule: HomeActivityComposeTest
     /**
      * Clicks a tab's media button when there is only one tab with media.
      */
+    @OptIn(ExperimentalTestApi::class)
     fun clickTabMediaControlButton(action: String) {
+        composeTestRule.waitUntilAtLeastOneExists(hasContentDescription(action), waitingTime)
         composeTestRule.tabMediaControlButton(action)
             .performClick()
     }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
new file mode 100644
index 000000000..93a13b7d8
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ComposeTopSitesRobot.kt
@@ -0,0 +1,164 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.ui.robots
+
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.filter
+import androidx.compose.ui.test.hasAnyChild
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.longClick
+import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onFirst
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performTouchInput
+import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
+import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
+import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.home.topsites.TopSitesTestTag
+
+/**
+ * Implementation of Robot Pattern for the Compose Top Sites.
+ */
+class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestRule) {
+
+    fun verifyExistingTopSitesList() =
+        composeTestRule.onNodeWithTag(TopSitesTestTag.topSites).assertExists()
+
+    @OptIn(ExperimentalTestApi::class)
+    fun verifyExistingTopSiteItem(vararg titles: String) {
+        titles.forEach { title ->
+            composeTestRule.waitUntilAtLeastOneExists(hasText(title), waitingTime)
+            composeTestRule.topSiteItem(title).assertExists()
+        }
+    }
+
+    fun verifyNotExistingTopSiteItem(vararg titles: String) {
+        titles.forEach { title ->
+            itemContainingText(title).waitForExists(waitingTime)
+            composeTestRule.topSiteItem(title).assertDoesNotExist()
+        }
+    }
+
+    fun verifyTopSiteContextMenuItems() {
+        verifyTopSiteContextMenuOpenInPrivateTabButton()
+        verifyTopSiteContextMenuRemoveButton()
+        verifyTopSiteContextMenuRenameButton()
+    }
+
+    fun verifyTopSiteContextMenuOpenInPrivateTabButton() {
+        composeTestRule.contextMenuItemOpenInPrivateTab().assertExists()
+    }
+
+    fun verifyTopSiteContextMenuRenameButton() {
+        composeTestRule.contextMenuItemRename().assertExists()
+    }
+
+    fun verifyTopSiteContextMenuRemoveButton() {
+        composeTestRule.contextMenuItemRemove().assertExists()
+    }
+
+    class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
+
+        fun openTopSiteTabWithTitle(
+            title: String,
+            interact: BrowserRobot.() -> Unit,
+        ): BrowserRobot.Transition {
+            composeTestRule.topSiteItem(title).performScrollTo().performClick()
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+
+        fun openTopSiteInPrivate(
+            interact: BrowserRobot.() -> Unit,
+        ): BrowserRobot.Transition {
+            composeTestRule.contextMenuItemOpenInPrivateTab().performClick()
+            composeTestRule.waitForIdle()
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+
+        fun openContextMenuOnTopSitesWithTitle(
+            title: String,
+            interact: ComposeTopSitesRobot.() -> Unit,
+        ): Transition {
+            composeTestRule.topSiteItem(title).performScrollTo().performTouchInput {
+                longClick()
+            }
+
+            ComposeTopSitesRobot(composeTestRule).interact()
+            return Transition(composeTestRule)
+        }
+
+        fun renameTopSite(
+            title: String,
+            interact: ComposeTopSitesRobot.() -> Unit,
+        ): Transition {
+            composeTestRule.contextMenuItemRename().performClick()
+            itemWithResId("$packageName:id/top_site_title")
+                .also {
+                    it.waitForExists(waitingTimeShort)
+                    it.setText(title)
+                }
+            itemWithResIdContainingText("android:id/button1", "OK").click()
+
+            ComposeTopSitesRobot(composeTestRule).interact()
+            return Transition(composeTestRule)
+        }
+
+        @OptIn(ExperimentalTestApi::class)
+        fun removeTopSite(
+            interact: ComposeTopSitesRobot.() -> Unit,
+        ): Transition {
+            composeTestRule.contextMenuItemRemove().performClick()
+            composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
+
+            ComposeTopSitesRobot(composeTestRule).interact()
+            return Transition(composeTestRule)
+        }
+
+        @OptIn(ExperimentalTestApi::class)
+        fun deleteTopSiteFromHistory(
+            interact: BrowserRobot.() -> Unit,
+        ): BrowserRobot.Transition {
+            composeTestRule.contextMenuItemRemove().performClick()
+            composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+    }
+}
+
+/**
+ * Obtains the top site with the provided [title].
+ */
+private fun ComposeTestRule.topSiteItem(title: String) =
+    onAllNodesWithTag(TopSitesTestTag.topSiteItemRoot).filter(hasAnyChild(hasText(title))).onFirst()
+
+/**
+ * Obtains the option to open in private tab the top site
+ */
+private fun ComposeTestRule.contextMenuItemOpenInPrivateTab() =
+    onAllNodesWithTag(TopSitesTestTag.openInPrivateTab).onFirst()
+
+/**
+ * Obtains the option to rename the top site
+ */
+private fun ComposeTestRule.contextMenuItemRename() = onAllNodesWithTag(TopSitesTestTag.rename).onFirst()
+
+/**
+ * Obtains the option to remove the top site
+ */
+private fun ComposeTestRule.contextMenuItemRemove() = onAllNodesWithTag(TopSitesTestTag.remove).onFirst()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
index 31cc5ae6f..c7a303937 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt
@@ -167,13 +167,6 @@ class CustomTabRobot {
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
         }
-
-        fun goBackToOnboardingScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
-            mDevice.pressBack()
-
-            HomeScreenRobot().interact()
-            return HomeScreenRobot.Transition()
-        }
     }
 }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
index 6bca13907..085723b6f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt
@@ -29,6 +29,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants.PackageName.GOOGLE_APPS_PHOTOS
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithDescription
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
+import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
@@ -48,7 +49,58 @@ class DownloadRobot {
 
     fun verifyDownloadPrompt(fileName: String) = assertDownloadPrompt(fileName)
 
-    fun verifyDownloadNotificationPopup() = assertDownloadNotificationPopup()
+    fun verifyDownloadCompleteNotificationPopup() {
+        assertTrue(
+            "Download notification Open button not found",
+            mDevice.findObject(UiSelector().text("Open"))
+                .waitForExists(waitingTime),
+        )
+        assertTrue(
+            "Download completed notification text doesn't match",
+            mDevice.findObject(UiSelector().textContains("Download completed"))
+                .waitForExists(waitingTime),
+        )
+        assertTrue(
+            "Downloaded file name not visible",
+            mDevice.findObject(UiSelector().resourceId("$packageName:id/download_dialog_filename"))
+                .waitForExists(waitingTime),
+        )
+    }
+
+    fun verifyDownloadFailedPrompt(fileName: String) {
+        assertTrue(
+            itemWithResId("$packageName:id/download_dialog_icon")
+                .waitForExists(waitingTime),
+        )
+        assertTrue(
+            "Download dialog title not displayed",
+            itemWithResIdAndText(
+                "$packageName:id/download_dialog_title",
+                "Download failed",
+            ).waitForExists(waitingTime),
+        )
+        assertTrue(
+            "Download file name not displayed",
+            itemWithResIdContainingText(
+                "$packageName:id/download_dialog_filename",
+                fileName,
+            ).waitForExists(waitingTime),
+        )
+        assertTrue(
+            "Try again button not displayed",
+            itemWithResIdAndText(
+                "$packageName:id/download_dialog_action_button",
+                "Try Again",
+            ).waitForExists(waitingTime),
+        )
+    }
+
+    fun clickTryAgainButton() {
+        itemWithResIdAndText(
+            "$packageName:id/download_dialog_action_button",
+            "Try Again",
+        ).click()
+    }
 
     fun verifyPhotosAppOpens() = assertExternalAppOpens(GOOGLE_APPS_PHOTOS)
 
@@ -126,13 +178,6 @@ class DownloadRobot {
             return BrowserRobot.Transition()
         }
 
-        fun closePrompt(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            closePromptButton().click()
-
-            BrowserRobot().interact()
-            return BrowserRobot.Transition()
-        }
-
         fun closeDownloadPrompt(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             itemWithResId("$packageName:id/download_dialog_close_button").click()
 
@@ -216,24 +261,6 @@ private fun assertDownloadPrompt(fileName: String) {
     }
 }
 
-private fun assertDownloadNotificationPopup() {
-    assertTrue(
-        "Download notification Open button not found",
-        mDevice.findObject(UiSelector().text("Open"))
-            .waitForExists(waitingTime),
-    )
-    assertTrue(
-        "Download completed notification text doesn't match",
-        mDevice.findObject(UiSelector().textContains("Download completed"))
-            .waitForExists(waitingTime),
-    )
-    assertTrue(
-        "Downloaded file name not visible",
-        mDevice.findObject(UiSelector().resourceId("$packageName:id/download_dialog_filename"))
-            .waitForExists(waitingTime),
-    )
-}
-
 private fun closeCompletedDownloadButton() =
     onView(withId(R.id.download_dialog_close_button))
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
index dcf4a8c88..0cd61c723 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
@@ -82,6 +82,9 @@ class HistoryRobot {
         deleteButton(item).click()
     }
 
+    fun verifyDeleteHistoryItemButton(historyItemTitle: String) =
+        deleteButton(historyItemTitle).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+
     fun clickDeleteAllHistoryButton() = deleteButton().click()
 
     fun selectEverythingOption() = deleteHistoryEverythingOption().click()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 15dda4234..0622a0592 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -494,10 +494,6 @@ class HomeScreenRobot {
             return SearchRobot.Transition()
         }
 
-        fun dismissOnboarding() {
-            openThreeDotMenu { }.openSettings { }.goBack { }
-        }
-
         fun clickUpgradingUserOnboardingSignInButton(
             testRule: ComposeTestRule,
             interact: SyncSignInRobot.() -> Unit,
@@ -785,6 +781,11 @@ fun homeScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition
     return HomeScreenRobot.Transition()
 }
 
+fun homeScreenWithComposeTopSites(composeTestRule: HomeActivityComposeTestRule, interact: ComposeTopSitesRobot.() -> Unit): ComposeTopSitesRobot.Transition {
+    ComposeTopSitesRobot(composeTestRule).interact()
+    return ComposeTopSitesRobot.Transition(composeTestRule)
+}
+
 private fun homeScreenList() =
     UiScrollable(
         UiSelector()
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 0fac81254..a9d9cb127 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -191,6 +191,19 @@ class NavigationToolbarRobot {
             return BrowserRobot.Transition()
         }
 
+        fun enterURLAndEnterToBrowserForTCPCFR(
+            url: Uri,
+            interact: BrowserRobot.() -> Unit,
+        ): BrowserRobot.Transition {
+            openEditURLView()
+
+            awesomeBar().setText(url.toString())
+            mDevice.pressEnter()
+
+            BrowserRobot().interact()
+            return BrowserRobot.Transition()
+        }
+
         fun openTabCrashReporter(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             val crashUrl = "about:crashcontent"
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
index 6d7c5de1c..06ad6c1d2 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt
@@ -165,6 +165,11 @@ class NotificationRobot {
         }
     }
 
+    fun clickNotification(notificationMessage: String) {
+        mDevice.findObject(UiSelector().text(notificationMessage)).waitForExists(waitingTime)
+        mDevice.findObject(UiSelector().text(notificationMessage)).click()
+    }
+
     class Transition {
 
         fun clickClosePrivateTabsNotification(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index 1f4e977a1..ecffa0e59 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -6,7 +6,11 @@
 
 package org.mozilla.fenix.ui.robots
 
+import androidx.compose.ui.test.ComposeTimeoutException
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assertAny
+import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onAllNodesWithTag
@@ -117,7 +121,7 @@ class SearchRobot {
         }
     }
 
-    fun verifyNoSuggestionsAreDisplayed(rule: ComposeTestRule, vararg searchSuggestions: String) {
+    fun verifySuggestionsAreNotDisplayed(rule: ComposeTestRule, vararg searchSuggestions: String) {
         rule.waitForIdle()
         for (searchSuggestion in searchSuggestions) {
             rule.onAllNodesWithTag("mozac.awesomebar.suggestions")
@@ -128,6 +132,28 @@ class SearchRobot {
         }
     }
 
+    @OptIn(ExperimentalTestApi::class)
+    fun verifySearchSuggestionsCount(rule: ComposeTestRule, numberOfSuggestions: Int, searchTerm: String) {
+        for (i in 1..RETRY_COUNT) {
+            try {
+                rule.waitUntilNodeCount(hasTestTag("mozac.awesomebar.suggestion"), numberOfSuggestions, waitingTime)
+                rule.onAllNodesWithTag("mozac.awesomebar.suggestion").assertCountEquals(numberOfSuggestions)
+
+                break
+            } catch (e: ComposeTimeoutException) {
+                if (i == RETRY_COUNT) {
+                    throw e
+                } else {
+                    mDevice.pressBack()
+                    homeScreen {
+                    }.openSearch {
+                        typeSearch(searchTerm)
+                    }
+                }
+            }
+        }
+    }
+
     fun verifyAllowSuggestionsInPrivateModeDialog() {
         assertTrue(
             mDevice.findObject(
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
index 5203940d7..3b25a269d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
@@ -35,7 +35,6 @@ import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appName
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.settings.SupportUtils
 import java.text.SimpleDateFormat
 import java.time.LocalDateTime
@@ -48,8 +47,12 @@ import java.util.Date
  * Implementation of Robot Pattern for the settings search sub menu.
  */
 class SettingsSubMenuAboutRobot {
-
-    fun verifyAboutFirefoxPreview() = assertFirefoxPreviewPage()
+    fun verifyAboutFirefoxPreviewInfo() {
+        assertVersionNumber()
+        assertProductCompany()
+        assertCurrentTimestamp()
+        verifyTheLinksList()
+    }
 
     class Transition {
         fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
@@ -61,13 +64,6 @@ class SettingsSubMenuAboutRobot {
     }
 }
 
-private fun assertFirefoxPreviewPage() {
-    assertVersionNumber()
-    assertProductCompany()
-    assertCurrentTimestamp()
-    verifyListElements()
-}
-
 private fun navigateBackToAboutPage(itemToInteract: () -> Unit) {
     navigationToolbar {
     }.openThreeDotMenu {
@@ -77,7 +73,7 @@ private fun navigateBackToAboutPage(itemToInteract: () -> Unit) {
     }
 }
 
-private fun verifyListElements() {
+private fun verifyTheLinksList() {
     assertAboutToolbar()
     assertWhatIsNewInFirefoxPreview()
     navigateBackToAboutPage(::assertSupport)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index 0c0cf2ebc..86d01b8b1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -41,6 +41,7 @@ import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper.appName
 import org.mozilla.fenix.helpers.TestHelper.mDevice
+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.click
@@ -51,6 +52,22 @@ import org.mozilla.fenix.helpers.ext.waitNotNull
  */
 
 class SettingsSubMenuAddonsManagerRobot {
+    fun verifyAddonsListIsDisplayed(shouldBeDisplayed: Boolean) {
+        if (shouldBeDisplayed) {
+            assertTrue(
+                mDevice.findObject(
+                    UiSelector().resourceId("$packageName:id/add_ons_list"),
+                ).waitForExists(waitingTime),
+            )
+        } else {
+            assertTrue(
+                mDevice.findObject(
+                    UiSelector().resourceId("$packageName:id/add_ons_list"),
+                ).waitUntilGone(waitingTime),
+            )
+        }
+    }
+
     fun verifyAddonPermissionPrompt(addonName: String) {
         mDevice.waitNotNull(Until.findObject(By.text("Add $addonName?")), waitingTime)
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
index f6f93472c..277f58e7e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
@@ -40,7 +40,6 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
 import org.mozilla.fenix.helpers.Constants.RETRY_COUNT
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemContainingTextExists
-import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdAndDescriptionExists
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdAndTextExists
 import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdExists
 import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
@@ -297,12 +296,6 @@ class TabDrawerRobot {
             itemContainingText(getStringResource(R.string.synced_tabs_sign_in_message)),
             itemContainingText(getStringResource(R.string.sync_sign_in)),
         )
-        assertItemWithResIdAndDescriptionExists(
-            itemWithResIdAndDescription(
-                "$packageName:id/new_tab_button",
-                getStringResource(R.string.resync_button_content_description),
-            ),
-        )
     }
 
     class Transition {
diff --git a/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_normal.png b/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_normal.png
index 4cb02fda4..ad040413c 100644
Binary files a/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_normal.png and b/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_private.png b/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_private.png
index 037e08be6..af4196b6e 100644
Binary files a/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_private.png and b/app/src/beta/res/drawable-hdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_normal.png b/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_normal.png
index 193efde2d..d378e855c 100644
Binary files a/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_normal.png and b/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_private.png b/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_private.png
index c0f356d16..791d76835 100644
Binary files a/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_private.png and b/app/src/beta/res/drawable-mdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_normal.png b/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_normal.png
index 7badabff9..c89456aca 100644
Binary files a/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_normal.png and b/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_private.png b/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_private.png
index 2573901b9..b4594f712 100644
Binary files a/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_private.png and b/app/src/beta/res/drawable-xhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_normal.png b/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_normal.png
index 6a99dc263..f5a7c9be1 100644
Binary files a/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_normal.png and b/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_private.png b/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_private.png
index f3e888316..89f49c3d9 100644
Binary files a/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_private.png and b/app/src/beta/res/drawable-xxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png b/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png
index 64afec5d2..c5592328d 100644
Binary files a/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png and b/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_private.png b/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_private.png
index bb842f128..ab9368256 100644
Binary files a/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_private.png and b/app/src/beta/res/drawable-xxxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/beta/res/drawable/animated_splash_screen.xml b/app/src/beta/res/drawable/animated_splash_screen.xml
index 5d0d00b8e..02b55b57a 100644
--- a/app/src/beta/res/drawable/animated_splash_screen.xml
+++ b/app/src/beta/res/drawable/animated_splash_screen.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt" >
     <aapt:attr name="android:drawable">
diff --git a/app/src/beta/res/drawable/ic_wordmark_text_normal.png b/app/src/beta/res/drawable/ic_wordmark_text_normal.png
index 16ef53a53..c46dca395 100644
Binary files a/app/src/beta/res/drawable/ic_wordmark_text_normal.png and b/app/src/beta/res/drawable/ic_wordmark_text_normal.png differ
diff --git a/app/src/beta/res/drawable/ic_wordmark_text_private.png b/app/src/beta/res/drawable/ic_wordmark_text_private.png
index 21e67c44a..78539347d 100644
Binary files a/app/src/beta/res/drawable/ic_wordmark_text_private.png and b/app/src/beta/res/drawable/ic_wordmark_text_private.png differ
diff --git a/app/src/debug/res/drawable/animated_splash_screen.xml b/app/src/debug/res/drawable/animated_splash_screen.xml
index 4e96325db..e2b7ead51 100644
--- a/app/src/debug/res/drawable/animated_splash_screen.xml
+++ b/app/src/debug/res/drawable/animated_splash_screen.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt" >
     <aapt:attr name="android:drawable">
diff --git a/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt b/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt
index d7a120a6e..f33b8e107 100644
--- a/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt
+++ b/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt
@@ -41,4 +41,5 @@ enum class BrowserDirection(@IdRes val fragmentId: Int) {
     FromLoginDetailFragment(R.id.loginDetailFragment),
     FromTabsTray(R.id.tabsTrayFragment),
     FromRecentlyClosed(R.id.recentlyClosedFragment),
+    FromReviewQualityCheck(R.id.reviewQualityCheckFragment),
 }
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 96f831323..d33a92aa2 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -67,4 +67,15 @@ object FeatureFlags {
      * Enables the lib-state HistoryFragment refactor
      */
     val historyFragmentLibStateRefactor = Config.channel.isNightlyOrDebug
+
+    /**
+     * Allows users to enable translations.
+     * Preference to fully enable translations is pref_key_enable_translations.
+     */
+    val translations = Config.channel.isDebug
+
+    /**
+     * Allows users to enable Firefox Suggest.
+     */
+    val fxSuggest = Config.channel.isDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index 01fa39b33..29bd08b44 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -43,6 +43,7 @@ import mozilla.components.concept.storage.FrecencyThresholdOption
 import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker
 import mozilla.components.feature.addons.update.GlobalAddonDependencyProvider
 import mozilla.components.feature.autofill.AutofillUseCases
+import mozilla.components.feature.fxsuggest.GlobalFxSuggestDependencyProvider
 import mozilla.components.feature.search.ext.buildSearchUrl
 import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine
 import mozilla.components.feature.top.sites.TopSitesFrecencyConfig
@@ -282,6 +283,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         startMetricsIfEnabled()
         setupPush()
 
+        GlobalFxSuggestDependencyProvider.initialize(components.fxSuggest.storage)
+
         visibilityLifecycleCallback = VisibilityLifecycleCallback(getSystemService())
         registerActivityLifecycleCallbacks(visibilityLifecycleCallback)
         registerActivityLifecycleCallbacks(MarkersActivityLifecycleCallbacks(components.core.engine))
@@ -365,6 +368,14 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                         components.core.historyMetadataService.cleanup(
                             System.currentTimeMillis() - Core.HISTORY_METADATA_MAX_AGE_IN_MS,
                         )
+
+                        // If Firefox Suggest is enabled, register a worker to periodically ingest
+                        // new search suggestions. The worker requires us to have called
+                        // `GlobalFxSuggestDependencyProvider.initialize`, which we did before
+                        // scheduling these tasks.
+                        if (settings().enableFxSuggest) {
+                            components.fxSuggest.ingestionScheduler.startPeriodicIngestion()
+                        }
                     }
                 }
                 // Account manager initialization needs to happen on the main thread.
@@ -749,6 +760,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             adjustCreative.set(settings.adjustCreative)
             adjustNetwork.set(settings.adjustNetwork)
 
+            settings.migrateSearchWidgetInstalledPrefIfNeeded()
             searchWidgetInstalled.set(settings.searchWidgetInstalled)
 
             val openTabsCount = settings.openTabsCount
@@ -815,6 +827,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             )
 
             ramMoreThanThreshold.set(isDeviceRamAboveThreshold)
+            deviceTotalRam.set(getDeviceTotalRAM())
         }
 
         with(AndroidAutofill) {
@@ -863,12 +876,27 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
         }
     }
 
-    private fun deviceRamApproxMegabytes(): Long {
+    @VisibleForTesting
+    internal fun getDeviceTotalRAM(): Long {
+        val memoryInfo = getMemoryInfo()
+        return if (SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            memoryInfo.advertisedMem
+        } else {
+            memoryInfo.totalMem
+        }
+    }
+
+    @VisibleForTesting
+    internal fun getMemoryInfo(): ActivityManager.MemoryInfo {
         val memoryInfo = ActivityManager.MemoryInfo()
         val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
         activityManager.getMemoryInfo(memoryInfo)
 
-        val deviceRamBytes = memoryInfo.totalMem
+        return memoryInfo
+    }
+
+    private fun deviceRamApproxMegabytes(): Long {
+        val deviceRamBytes = getMemoryInfo().totalMem
         return deviceRamBytes.toRoundedMegabytes()
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index a56ff7b48..65c8cae5d 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -80,7 +80,7 @@ import mozilla.components.support.utils.BrowsersCache
 import mozilla.components.support.utils.ManufacturerCodes
 import mozilla.components.support.utils.SafeIntent
 import mozilla.components.support.utils.toSafeIntent
-import mozilla.components.support.webextensions.WebExtensionPopupFeature
+import mozilla.components.support.webextensions.WebExtensionPopupObserver
 import mozilla.telemetry.glean.private.NoExtras
 import org.mozilla.experiments.nimbus.initializeTooling
 import org.mozilla.fenix.GleanMetrics.AppIcon
@@ -153,6 +153,7 @@ import org.mozilla.fenix.settings.search.SaveSearchEngineFragmentDirections
 import org.mozilla.fenix.settings.studies.StudiesFragmentDirections
 import org.mozilla.fenix.settings.wallpaper.WallpaperSettingsFragmentDirections
 import org.mozilla.fenix.share.AddNewDeviceFragmentDirections
+import org.mozilla.fenix.shopping.ReviewQualityCheckFragmentDirections
 import org.mozilla.fenix.shortcut.NewTabShortcutIntentProcessor.Companion.ACTION_OPEN_PRIVATE_TAB
 import org.mozilla.fenix.tabhistory.TabHistoryDialogFragment
 import org.mozilla.fenix.tabstray.TabsTrayFragment
@@ -189,8 +190,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
     private var isToolbarInflated = false
 
-    private val webExtensionPopupFeature by lazy {
-        WebExtensionPopupFeature(components.core.store, ::openPopup)
+    private val webExtensionPopupObserver by lazy {
+        WebExtensionPopupObserver(components.core.store, ::openPopup)
+    }
+
+    private val extensionProcessDisabledPopupObserver by lazy {
+        ExtensionProcessDisabledController(this@HomeActivity, components.core.store)
     }
 
     private val extensionProcessDisabledPopupFeature by lazy {
@@ -307,6 +312,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             if (savedInstanceState == null) {
                 navigateToHome()
             }
+
             if (!shouldStartOnHome() && shouldNavigateToBrowserOnColdStart(savedInstanceState)) {
                 navigateToBrowserOnColdStart()
             } else {
@@ -316,6 +322,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             if (settings().showHomeOnboardingDialog && components.fenixOnboarding.userHasBeenOnboarded()) {
                 navHost.navController.navigate(NavGraphDirections.actionGlobalHomeOnboardingDialog())
             }
+
             showNotificationPermissionPromptIfRequired()
         }
 
@@ -345,7 +352,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         }
         supportActionBar?.hide()
 
-        lifecycle.addObservers(webExtensionPopupFeature, extensionProcessDisabledPopupFeature, serviceWorkerSupport)
+        lifecycle.addObservers(webExtensionPopupObserver, extensionProcessDisabledPopupObserver, serviceWorkerSupport)
 
         if (shouldAddToRecentsScreen(intent)) {
             intent.removeExtra(START_IN_RECENTS_SCREEN)
@@ -412,10 +419,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
      * Show the pre permission dialog to the user once if the notification are not enabled.
      */
     private fun showNotificationPermissionPromptIfRequired() {
-        if (settings().junoOnboardingEnabled) {
-            return
-        }
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             !NotificationManagerCompat.from(applicationContext).areNotificationsEnabledSafe() &&
             settings().numberOfAppLaunches <= 1
@@ -1045,6 +1048,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
         BrowserDirection.FromStudiesFragment -> StudiesFragmentDirections.actionGlobalBrowser(
             customTabSessionId,
         )
+        BrowserDirection.FromReviewQualityCheck -> ReviewQualityCheckFragmentDirections.actionGlobalBrowser(
+            customTabSessionId,
+        )
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index bc493f4ea..4cccac237 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -32,7 +32,6 @@ import io.github.forkmaintainers.iceraven.components.PagedAddonsManagerAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
-import mozilla.components.concept.engine.webextension.WebExtensionInstallException
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.AddonManager
 import mozilla.components.feature.addons.AddonManagerException
@@ -40,20 +39,22 @@ import mozilla.components.feature.addons.ui.translateName
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.ktx.android.view.hideKeyboard
+import mozilla.components.feature.addons.ui.AddonsManagerAdapter
+import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.databinding.FragmentAddOnsManagementBinding
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.getRootView
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.extension.WebExtensionPromptFeature
 import org.mozilla.fenix.theme.ThemeManager
-import java.util.concurrent.CancellationException
 import java.util.Locale
 
 /**
@@ -70,11 +71,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
 
     private val webExtensionPromptFeature = ViewBoundFeatureWrapper<WebExtensionPromptFeature>()
 
-    /**
-     * Whether or not an add-on installation is in progress.
-     */
-    private var isInstallationInProgress = false
-
     private var installExternalAddonComplete: Boolean
         set(value) {
             arguments?.putBoolean(BUNDLE_KEY_INSTALL_EXTERNAL_ADDON_COMPLETE, value)
@@ -98,10 +94,8 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
         webExtensionPromptFeature.set(
             feature = WebExtensionPromptFeature(
                 store = requireComponents.core.store,
-                provideAddons = { addons!! },
                 context = requireContext(),
                 fragmentManager = parentFragmentManager,
-                snackBarParentView = view,
                 onAddonChanged = {
                     runIfFragmentIsAttached {
                         adapter?.updateAddon(it)
@@ -239,6 +233,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
         val managementView = AddonsManagementView(
             navController = findNavController(),
             onInstallButtonClicked = ::installAddon,
+            onMoreAddonsButtonClicked = ::openAMO,
         )
 
         val recyclerView = binding?.addOnsList
@@ -265,7 +260,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                                 style = createAddonStyle(requireContext()),
                             )
                         }
-                        isInstallationInProgress = false
                         binding?.addOnsProgressBar?.isVisible = false
                         binding?.addOnsEmptyMessage?.isVisible = false
 
@@ -290,7 +284,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                                 getString(R.string.mozac_feature_addons_failed_to_query_add_ons),
                             )
                         }
-                        isInstallationInProgress = false
                         binding?.addOnsProgressBar?.isVisible = false
                         binding?.addOnsEmptyMessage?.isVisible = true
                     }
@@ -357,30 +350,12 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
             addon,
             onSuccess = {
                 runIfFragmentIsAttached {
-                    isInstallationInProgress = false
                     adapter?.updateAddon(it)
                     binding?.addonProgressOverlay?.overlayCardView?.visibility = View.GONE
                 }
             },
-            onError = { _, e ->
-                this@AddonsManagementFragment.view?.let { view ->
-                    // No need to display an error message if installation was cancelled by the user.
-                    if (e !is CancellationException && e !is WebExtensionInstallException.UserCancelled) {
-                        val rootView = activity?.getRootView() ?: view
-                        var messageId = R.string.mozac_feature_addons_failed_to_install
-                        if (e is WebExtensionInstallException.Blocklisted) {
-                            messageId = R.string.mozac_feature_addons_blocklisted
-                        }
-                        context?.let {
-                            showErrorSnackBar(
-                                text = getString(messageId, addon.translateName(it)),
-                                anchorView = rootView,
-                            )
-                        }
-                    }
-                    binding?.addonProgressOverlay?.overlayCardView?.visibility = View.GONE
-                    isInstallationInProgress = false
-                }
+            onError = { _, _ ->
+                binding?.addonProgressOverlay?.overlayCardView?.visibility = View.GONE
             },
         )
         binding?.addonProgressOverlay?.cancelButton?.setOnClickListener {
@@ -413,7 +388,20 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
         }
     }
 
+    private fun openAMO() {
+        (activity as HomeActivity).openToBrowserAndLoad(
+            searchTermOrURL = AMO_HOMEPAGE_FOR_ANDROID,
+            newTab = true,
+            from = BrowserDirection.FromGlobal,
+        )
+    }
+
     companion object {
         private const val BUNDLE_KEY_INSTALL_EXTERNAL_ADDON_COMPLETE = "INSTALL_EXTERNAL_ADDON_COMPLETE"
+
+        // This is locale-less on purpose so that the content negotiation happens on the AMO side because the current
+        // user language might not be supported by AMO and/or the language might not be exactly what AMO is expecting
+        // (e.g. `en` instead of `en-US`).
+        private const val AMO_HOMEPAGE_FOR_ANDROID = "https://addons.mozilla.org/android/"
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementView.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementView.kt
index a58fa9596..117c3f8e5 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementView.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementView.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.addons
 import androidx.navigation.NavController
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.ui.AddonsManagerAdapterDelegate
+import org.mozilla.fenix.Config
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.navigateSafe
 
@@ -16,6 +17,7 @@ import org.mozilla.fenix.ext.navigateSafe
 class AddonsManagementView(
     private val navController: NavController,
     private val onInstallButtonClicked: (Addon) -> Unit,
+    private val onMoreAddonsButtonClicked: () -> Unit,
 ) : AddonsManagerAdapterDelegate {
 
     override fun onAddonItemClicked(addon: Addon) {
@@ -34,6 +36,14 @@ class AddonsManagementView(
         showNotYetSupportedAddonFragment(unsupportedAddons)
     }
 
+    override fun shouldShowFindMoreAddonsButton(): Boolean {
+        return !Config.channel.isRelease
+    }
+
+    override fun onFindMoreAddonsButtonClicked() {
+        onMoreAddonsButtonClicked()
+    }
+
     private fun showInstalledAddonDetailsFragment(addon: Addon) {
         val directions =
             AddonsManagementFragmentDirections.actionAddonsManagementFragmentToInstalledAddonDetails(
diff --git a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt b/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
index 0148de27a..4d85768c2 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
@@ -10,62 +10,17 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.annotation.UiContext
 import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.LifecycleOwner
 import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupAction
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.Engine
 import mozilla.components.support.ktx.android.content.appName
-import mozilla.components.support.webextensions.ExtensionProcessDisabledPopupFeature
+import mozilla.components.support.webextensions.ExtensionProcessDisabledPopupObserver
 import org.mozilla.fenix.GleanMetrics.Addons
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.geckoview.WebExtensionController
 
-/**
- * Present a dialog to the user notifying of extension process spawning disabled and also asking
- * whether they would like to continue trying or disable extensions. If the user chooses to retry,
- * enable the extension process spawning with [WebExtensionController.enableExtensionProcessSpawning].
- *
- * @param context to show the AlertDialog
- * @param store The [BrowserStore] which holds the state for showing the dialog
- * @param webExtensionController to call when a user enables the process spawning
- * @param builder to use for creating the dialog which can be styled as needed
- * @param appName to be added to the message. Necessary to be added as a param for testing
- */
-private fun presentDialog(
-    @UiContext context: Context,
-    store: BrowserStore,
-    engine: Engine,
-    builder: AlertDialog.Builder,
-    appName: String,
-) {
-    val message = context.getString(R.string.addon_process_crash_dialog_message, appName)
-    var onDismissDialog: (() -> Unit)? = null
-    val layout = LayoutInflater.from(context)
-        .inflate(R.layout.crash_extension_dialog, null, false)
-    layout?.apply {
-        findViewById<TextView>(R.id.message)?.text = message
-        findViewById<Button>(R.id.positive)?.setOnClickListener {
-            engine.enableExtensionProcessSpawning()
-            Addons.extensionsProcessUiRetry.add()
-            store.dispatch(ExtensionProcessDisabledPopupAction(false))
-            onDismissDialog?.invoke()
-        }
-        findViewById<Button>(R.id.negative)?.setOnClickListener {
-            Addons.extensionsProcessUiDisable.add()
-            store.dispatch(ExtensionProcessDisabledPopupAction(false))
-            onDismissDialog?.invoke()
-        }
-    }
-    builder.apply {
-        setCancelable(false)
-        setView(layout)
-        setTitle(R.string.addon_process_crash_dialog_title)
-    }
-
-    val dialog = builder.show()
-    onDismissDialog = { dialog?.dismiss() }
-}
-
 /**
  * Controller for showing the user a dialog when the the extension process spawning has been disabled.
  *
@@ -81,7 +36,71 @@ class ExtensionProcessDisabledController(
     engine: Engine = context.components.core.engine,
     builder: AlertDialog.Builder = AlertDialog.Builder(context),
     appName: String = context.appName,
-) : ExtensionProcessDisabledPopupFeature(
+) : ExtensionProcessDisabledPopupObserver(
     store,
     { presentDialog(context, store, engine, builder, appName) },
-)
+) {
+    override fun onDestroy(owner: LifecycleOwner) {
+        super.onDestroy(owner)
+        // In case the activity gets destroyed, we want to re-create the dialog.
+        shouldCreateDialog = true
+    }
+
+    companion object {
+        private var shouldCreateDialog: Boolean = true
+
+        /**
+         * Present a dialog to the user notifying of extension process spawning disabled and also asking
+         * whether they would like to continue trying or disable extensions. If the user chooses to retry,
+         * enable the extension process spawning with [WebExtensionController.enableExtensionProcessSpawning].
+         *
+         * @param context to show the AlertDialog
+         * @param store The [BrowserStore] which holds the state for showing the dialog
+         * @param webExtensionController to call when a user enables the process spawning
+         * @param builder to use for creating the dialog which can be styled as needed
+         * @param appName to be added to the message. Necessary to be added as a param for testing
+         */
+        private fun presentDialog(
+            @UiContext context: Context,
+            store: BrowserStore,
+            engine: Engine,
+            builder: AlertDialog.Builder,
+            appName: String,
+        ) {
+            if (!shouldCreateDialog) {
+                return
+            }
+
+            val message = context.getString(R.string.addon_process_crash_dialog_message, appName)
+            var onDismissDialog: (() -> Unit)? = null
+            val layout = LayoutInflater.from(context)
+                .inflate(R.layout.crash_extension_dialog, null, false)
+            layout?.apply {
+                findViewById<TextView>(R.id.message)?.text = message
+                findViewById<Button>(R.id.positive)?.setOnClickListener {
+                    engine.enableExtensionProcessSpawning()
+                    Addons.extensionsProcessUiRetry.add()
+                    store.dispatch(ExtensionProcessDisabledPopupAction(false))
+                    onDismissDialog?.invoke()
+                }
+                findViewById<Button>(R.id.negative)?.setOnClickListener {
+                    Addons.extensionsProcessUiDisable.add()
+                    store.dispatch(ExtensionProcessDisabledPopupAction(false))
+                    onDismissDialog?.invoke()
+                }
+            }
+            builder.apply {
+                setCancelable(false)
+                setView(layout)
+                setTitle(R.string.addon_process_crash_dialog_title)
+            }
+
+            val dialog = builder.show()
+            shouldCreateDialog = false
+            onDismissDialog = {
+                dialog?.dismiss()
+                shouldCreateDialog = true
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index b6eb3ecbe..58352e7cb 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -62,7 +62,6 @@ import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.feature.accounts.FxaCapability
 import mozilla.components.feature.accounts.FxaWebChannelFeature
-import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.app.links.AppLinksFeature
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.contextmenu.ContextMenuFeature
@@ -77,6 +76,8 @@ import mozilla.components.feature.prompts.PromptFeature
 import mozilla.components.feature.prompts.PromptFeature.Companion.PIN_REQUEST
 import mozilla.components.feature.prompts.address.AddressDelegate
 import mozilla.components.feature.prompts.creditcard.CreditCardDelegate
+import mozilla.components.feature.prompts.identitycredential.DialogColors
+import mozilla.components.feature.prompts.identitycredential.DialogColorsProvider
 import mozilla.components.feature.prompts.login.LoginDelegate
 import mozilla.components.feature.prompts.share.ShareDelegate
 import mozilla.components.feature.readerview.ReaderViewFeature
@@ -138,7 +139,6 @@ import org.mozilla.fenix.downloads.ThirdPartyDownloadDialog
 import org.mozilla.fenix.ext.accessibilityManager
 import org.mozilla.fenix.ext.breadcrumb
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.getFenixAddons
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.hideToolbar
 import org.mozilla.fenix.ext.nav
@@ -671,12 +671,20 @@ abstract class BaseBrowserFragment :
             view = view,
         )
 
+        val colorsProvider = DialogColorsProvider {
+            DialogColors(
+                title = ThemeManager.resolveAttributeColor(attribute = R.attr.textPrimary),
+                description = ThemeManager.resolveAttributeColor(attribute = R.attr.textSecondary),
+            )
+        }
+
         promptsFeature.set(
             feature = PromptFeature(
                 activity = activity,
                 store = store,
                 customTabId = customTabSessionId,
                 fragmentManager = parentFragmentManager,
+                identityCredentialColorsProvider = colorsProvider,
                 tabsUseCases = requireComponents.useCases.tabsUseCases,
                 creditCardValidationDelegate = DefaultCreditCardValidationDelegate(
                     context.components.core.lazyAutofillStorage,
@@ -918,10 +926,8 @@ abstract class BaseBrowserFragment :
         webExtensionPromptFeature.set(
             feature = WebExtensionPromptFeature(
                 store = requireComponents.core.store,
-                provideAddons = ::provideAddons,
                 context = requireContext(),
                 fragmentManager = parentFragmentManager,
-                snackBarParentView = binding.dynamicSnackbarContainer,
             ),
             owner = this,
             view = view,
@@ -1653,13 +1659,4 @@ abstract class BaseBrowserFragment :
 
         return isValidStatus && isSameTab
     }
-
-    private suspend fun provideAddons(): List<Addon> {
-        return withContext(IO) {
-            // We deactivated the cache to get the most up-to-date list of add-ons to match against.
-            // as this will be used to install add-ons from AMO.
-            val addons = requireContext().components.addonManager.getFenixAddons(allowCache = false)
-            addons
-        }
-    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 8f9c59803..1bd7b795b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -37,6 +37,7 @@ import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import org.mozilla.fenix.GleanMetrics.ReaderMode
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.TabCollectionStorage
@@ -96,17 +97,30 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
             )
         }
 
-        val homeAction = BrowserToolbar.Button(
-            imageDrawable = AppCompatResources.getDrawable(
-                context,
-                R.drawable.mozac_ic_home_24,
-            )!!,
-            contentDescription = context.getString(R.string.browser_toolbar_home),
-            iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
-            listener = browserToolbarInteractor::onHomeButtonClicked,
-        )
+        val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
+        val leadingAction = if (isPrivate && context.settings().feltPrivateBrowsingEnabled) {
+            BrowserToolbar.Button(
+                imageDrawable = AppCompatResources.getDrawable(
+                    context,
+                    R.drawable.mozac_ic_data_clearance_24,
+                )!!,
+                contentDescription = context.getString(R.string.browser_toolbar_erase),
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                listener = browserToolbarInteractor::onEraseButtonClicked,
+            )
+        } else {
+            BrowserToolbar.Button(
+                imageDrawable = AppCompatResources.getDrawable(
+                    context,
+                    R.drawable.mozac_ic_home_24,
+                )!!,
+                contentDescription = context.getString(R.string.browser_toolbar_home),
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                listener = browserToolbarInteractor::onHomeButtonClicked,
+            )
+        }
 
-        browserToolbarView.view.addNavigationAction(homeAction)
+        browserToolbarView.view.addNavigationAction(leadingAction)
 
         updateToolbarActions(isTablet = resources.getBoolean(R.bool.tablet))
 
@@ -203,17 +217,13 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
 
     private fun initReviewQualityCheck(context: Context, view: View) {
         val reviewQualityCheck =
-            BrowserToolbar.ToggleButton(
-                image = AppCompatResources.getDrawable(
-                    context,
-                    R.drawable.ic_shopping_cart,
-                )!!,
-                imageSelected = AppCompatResources.getDrawable(
+            BrowserToolbar.Button(
+                imageDrawable = AppCompatResources.getDrawable(
                     context,
-                    R.drawable.ic_shopping_cart,
+                    R.drawable.mozac_ic_shopping_24,
                 )!!,
-                contentDescription = context.getString(R.string.browser_menu_review_quality_check),
-                contentDescriptionSelected = context.getString(R.string.browser_menu_review_quality_check_close),
+                contentDescription = context.getString(R.string.review_quality_check_open_handle_content_description),
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
                 visible = { reviewQualityCheckAvailable },
                 listener = {
                     findNavController().navigate(
diff --git a/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt b/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
index 89efc2fab..b49478793 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
@@ -66,13 +66,16 @@ class TabPreview @JvmOverloads constructor(
         }
     }
 
-    fun loadPreviewThumbnail(thumbnailId: String) {
+    /**
+     * Load a preview for a thumbnail.
+     */
+    fun loadPreviewThumbnail(thumbnailId: String, isPrivate: Boolean) {
         doOnNextLayout {
             val previewThumbnail = binding.previewThumbnail
             val thumbnailSize = max(previewThumbnail.height, previewThumbnail.width)
             thumbnailLoader.loadIntoView(
                 previewThumbnail,
-                ImageLoadRequest(thumbnailId, thumbnailSize),
+                ImageLoadRequest(thumbnailId, thumbnailSize, isPrivate),
             )
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
index 6cde3be55..98fd21483 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
@@ -182,12 +182,12 @@ class ToolbarGestureHandler(
     }
 
     private fun preparePreview(destination: Destination) {
-        val thumbnailId = when (destination) {
-            is Destination.Tab -> destination.tab.id
+        val (thumbnailId, isPrivate) = when (destination) {
+            is Destination.Tab -> destination.tab.id to destination.tab.content.private
             is Destination.None -> return
         }
 
-        tabPreview.loadPreviewThumbnail(thumbnailId)
+        tabPreview.loadPreviewThumbnail(thumbnailId, isPrivate)
         tabPreview.alpha = 1f
         tabPreview.translationX = when (gestureDirection) {
             GestureDirection.RIGHT_TO_LEFT -> windowWidth.toFloat() + previewOffset
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
index fa907471f..7d3dccd2b 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
@@ -65,8 +65,8 @@ class CollectionCreationView(
             COLLECTION_NAME_MAX_LENGTH,
         )
         binding.nameCollectionEdittext.setOnEditorActionListener { view, actionId, _ ->
-            val text = view.text.toString()
-            if (actionId == EditorInfo.IME_ACTION_DONE && text.isNotBlank()) {
+            val text = view.text.toString().trim()
+            if (actionId == EditorInfo.IME_ACTION_DONE && text.isNotEmpty()) {
                 when (step) {
                     SaveCollectionStep.NameCollection ->
                         interactor.onNewCollectionNameSaved(selectedTabs.toList(), text)
@@ -76,7 +76,7 @@ class CollectionCreationView(
                     }
                 }
             }
-            false
+            actionId == EditorInfo.IME_ACTION_DONE && text.isEmpty()
         }
 
         binding.tabList.run {
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt
index 683d45862..05df70995 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionsDialog.kt
@@ -5,9 +5,12 @@
 package org.mozilla.fenix.collections
 
 import android.content.Context
+import android.content.DialogInterface
 import android.view.LayoutInflater
+import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doOnTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.MainScope
@@ -109,13 +112,13 @@ internal fun CollectionsDialog.showAddNewDialog(
         ),
     )
 
-    AlertDialog.Builder(context)
+    val dialog = AlertDialog.Builder(context)
         .setTitle(R.string.tab_tray_add_new_collection)
         .setView(layout).setPositiveButton(R.string.create_collection_positive) { dialog, _ ->
 
             MainScope().launch {
                 val id = storage.createCollection(
-                    collectionNameEditText.text.toString(),
+                    collectionNameEditText.text.toString().trim(),
                     sessionList,
                 )
                 onPositiveButtonClick.invoke(id, true)
@@ -128,8 +131,18 @@ internal fun CollectionsDialog.showAddNewDialog(
             dialog.cancel()
         }
         .create().withCenterAlignedButtons()
-        .show()
+
+    collectionNameEditText.doOnTextChanged { text, _, _, _ ->
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).isClickable = text.toString().isNotBlank()
+    }
+
+    dialog.show()
 
     collectionNameEditText.setSelection(0, collectionNameEditText.text.length)
     collectionNameEditText.showKeyboard()
+
+    collectionNameEditText.setOnEditorActionListener { _, actionId, _ ->
+        val text = collectionNameEditText.text.toString()
+        actionId == EditorInfo.IME_ACTION_DONE && text.isBlank()
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 7f43e61ae..73a6e405a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -206,6 +206,8 @@ class Components(private val context: Context) {
             ),
         )
     }
+
+    val fxSuggest by lazyMonitored { FxSuggest(context) }
 }
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index f6d7a2b0d..353a44306 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -210,7 +210,7 @@ class Core(
     }
 
     val sessionStorage: SessionStorage by lazyMonitored {
-        SessionStorage(context, engine = engine)
+        SessionStorage(context, engine, crashReporter)
     }
 
     private val locationService: LocationService by lazyMonitored {
diff --git a/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt b/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt
new file mode 100644
index 000000000..05593c97f
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/components/FxSuggest.kt
@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.components
+
+import android.content.Context
+import mozilla.components.feature.fxsuggest.FxSuggestIngestionScheduler
+import mozilla.components.feature.fxsuggest.FxSuggestStorage
+import org.mozilla.fenix.perf.lazyMonitored
+
+/**
+ * Component group for Firefox Suggest.
+ *
+ * @param context The Android application context.
+ */
+class FxSuggest(context: Context) {
+    val storage by lazyMonitored {
+        FxSuggestStorage(context)
+    }
+
+    val ingestionScheduler by lazyMonitored {
+        FxSuggestIngestionScheduler(context)
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt
index 8672d3d46..7baa2911d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt
@@ -5,19 +5,29 @@
 package org.mozilla.fenix.components.toolbar
 
 import android.content.Context
+import android.view.View
 import androidx.annotation.VisibleForTesting
 import androidx.compose.foundation.clickable
 import androidx.compose.material.Text
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat.getColor
+import androidx.core.view.isVisible
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.transformWhile
 import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
+import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.compose.cfr.CFRPopup
@@ -28,8 +38,11 @@ import mozilla.components.service.glean.private.NoExtras
 import org.mozilla.fenix.GleanMetrics.TrackingProtection
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.settings.SupportUtils.SumoTopic.TOTAL_COOKIE_PROTECTION
+import org.mozilla.fenix.shopping.DefaultShoppingExperienceFeature
+import org.mozilla.fenix.shopping.ShoppingExperienceFeature
 import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.utils.Settings
 
@@ -39,9 +52,9 @@ import org.mozilla.fenix.utils.Settings
 private const val CFR_TO_ANCHOR_VERTICAL_PADDING = -6
 
 /**
- * The minimum number of opened tabs to show the CFR.
+ * The minimum number of opened tabs to show the Total Cookie Protection CFR.
  */
-private const val CRF_MINIMUM_NUMBER_OPENED_TABS = 5
+private const val CFR_MINIMUM_NUMBER_OPENED_TABS = 5
 
 /**
  * Delegate for handling all the business logic for showing CFRs in the toolbar.
@@ -51,48 +64,105 @@ private const val CRF_MINIMUM_NUMBER_OPENED_TABS = 5
  * @param settings used to read and write persistent user settings
  * @param toolbar will serve as anchor for the CFRs
  * @param sessionId optional custom tab id used to identify the custom tab in which to show a CFR.
+ * @param shoppingExperienceFeature Used to determine if [ShoppingExperienceFeature] is enabled.
  */
 class BrowserToolbarCFRPresenter(
     private val context: Context,
     private val browserStore: BrowserStore,
     private val settings: Settings,
     private val toolbar: BrowserToolbar,
+    private val isPrivate: Boolean,
     private val sessionId: String? = null,
+    private val shoppingExperienceFeature: ShoppingExperienceFeature = DefaultShoppingExperienceFeature(
+        context.settings(),
+    ),
 ) {
     @VisibleForTesting
-    internal var tcpCfrScope: CoroutineScope? = null
+    internal var scope: CoroutineScope? = null
 
     @VisibleForTesting
-    internal var tcpCfrPopup: CFRPopup? = null
+    internal var popup: CFRPopup? = null
 
     /**
      * Start observing [browserStore] for updates which may trigger showing a CFR.
      */
     @Suppress("MagicNumber")
     fun start() {
-        if (shouldShowCFR()) {
-            tcpCfrScope = browserStore.flowScoped { flow ->
-                flow
-                    .mapNotNull { it.findCustomTabOrSelectedTab(sessionId)?.content?.progress }
-                    // The "transformWhile" below ensures that the 100% progress is only collected once.
-                    .transformWhile { progress ->
-                        emit(progress)
-                        progress != 100
-                    }
-                    .filter { it == 100 }
-                    .collect {
-                        tcpCfrScope?.cancel()
-                        showTcpCfr()
-                    }
+        when (getCFRToShow()) {
+            ToolbarCFR.TCP -> {
+                scope = browserStore.flowScoped { flow ->
+                    flow.mapNotNull { it.findCustomTabOrSelectedTab(sessionId)?.content?.progress }
+                        // The "transformWhile" below ensures that the 100% progress is only collected once.
+                        .transformWhile { progress ->
+                            emit(progress)
+                            progress != 100
+                        }.filter { it == 100 }.collect {
+                            scope?.cancel()
+                            showTcpCfr()
+                        }
+                }
+            }
+
+            ToolbarCFR.SHOPPING, ToolbarCFR.SHOPPING_OPTED_IN -> {
+                scope = browserStore.flowScoped { flow ->
+                    flow.mapNotNull { it.selectedTab }
+                        .filter { it.isProductUrl && it.content.progress == 100 && !it.content.loading }
+                        .distinctUntilChanged()
+                        .collect {
+                            if (toolbar.findViewById<View>(R.id.mozac_browser_toolbar_page_actions).isVisible) {
+                                scope?.cancel()
+                                showShoppingCFR(getCFRToShow() == ToolbarCFR.SHOPPING_OPTED_IN)
+                            }
+                        }
+                }
+            }
+
+            ToolbarCFR.ERASE -> {
+                scope = browserStore.flowScoped { flow ->
+                    flow
+                        .mapNotNull { it.findCustomTabOrSelectedTab(sessionId) }
+                        .filter { it.content.private }
+                        .map { it.content.progress }
+                        // The "transformWhile" below ensures that the 100% progress is only collected once.
+                        .transformWhile { progress ->
+                            emit(progress)
+                            progress != 100
+                        }
+                        .filter { it == 100 }
+                        .collect {
+                            scope?.cancel()
+                            showEraseCfr()
+                        }
+                }
+            }
+
+            ToolbarCFR.NONE -> {
+                // no-op
             }
         }
     }
 
-    private fun shouldShowCFR(): Boolean {
-        return settings.shouldShowTotalCookieProtectionCFR && (
+    private fun getCFRToShow(): ToolbarCFR = when {
+        settings.shouldShowEraseActionCFR && isPrivate -> {
+            ToolbarCFR.ERASE
+        }
+
+        settings.shouldShowTotalCookieProtectionCFR && (
             !settings.shouldShowCookieBannerReEngagementDialog() ||
-                settings.openTabsCount >= CRF_MINIMUM_NUMBER_OPENED_TABS
-            )
+                settings.openTabsCount >= CFR_MINIMUM_NUMBER_OPENED_TABS
+            ) -> ToolbarCFR.TCP
+
+        shoppingExperienceFeature.isEnabled &&
+            settings.shouldShowReviewQualityCheckCFR -> {
+            val optInTime = settings.reviewQualityCheckOptInTimeInMillis
+            if (optInTime != 0L && System.currentTimeMillis() - optInTime > Settings.ONE_DAY_MS) {
+                ToolbarCFR.SHOPPING_OPTED_IN
+            } else {
+                ToolbarCFR.SHOPPING
+            }
+        }
+
+        else -> ToolbarCFR.NONE
     }
 
     /**
@@ -100,10 +170,54 @@ class BrowserToolbarCFRPresenter(
      * CFRs already shown are not automatically dismissed.
      */
     fun stop() {
-        tcpCfrScope?.cancel()
+        scope?.cancel()
     }
 
     @VisibleForTesting
+    internal fun showEraseCfr() {
+        CFRPopup(
+            anchor = toolbar.findViewById(
+                R.id.mozac_browser_toolbar_navigation_actions,
+            ),
+            properties = CFRPopupProperties(
+                popupAlignment = INDICATOR_CENTERED_IN_ANCHOR,
+                popupBodyColors = listOf(
+                    getColor(context, R.color.fx_mobile_layer_color_gradient_end),
+                    getColor(context, R.color.fx_mobile_layer_color_gradient_start),
+                ),
+                popupVerticalOffset = CFR_TO_ANCHOR_VERTICAL_PADDING.dp,
+                dismissButtonColor = getColor(context, R.color.fx_mobile_icon_color_oncolor),
+                indicatorDirection = if (settings.toolbarPosition == ToolbarPosition.TOP) {
+                    CFRPopup.IndicatorDirection.UP
+                } else {
+                    CFRPopup.IndicatorDirection.DOWN
+                },
+            ),
+            onDismiss = {
+                when (it) {
+                    true -> TrackingProtection.tcpCfrExplicitDismissal.record(NoExtras())
+                    false -> TrackingProtection.tcpCfrImplicitDismissal.record(NoExtras())
+                }
+            },
+            text = {
+                FirefoxTheme {
+                    Text(
+                        text = context.getString(R.string.erase_action_cfr_message),
+                        color = FirefoxTheme.colors.textOnColorPrimary,
+                        style = FirefoxTheme.typography.body2,
+                    )
+                }
+            },
+        ).run {
+            settings.shouldShowEraseActionCFR = false
+            popup = this
+            show()
+        }
+    }
+
+    @OptIn(ExperimentalComposeUiApi::class)
+    @VisibleForTesting
+    @Suppress("LongMethod")
     internal fun showTcpCfr() {
         CFRPopup(
             anchor = toolbar.findViewById(
@@ -125,7 +239,10 @@ class BrowserToolbarCFRPresenter(
             ),
             onDismiss = {
                 when (it) {
-                    true -> TrackingProtection.tcpCfrExplicitDismissal.record(NoExtras())
+                    true -> {
+                        TrackingProtection.tcpCfrExplicitDismissal.record(NoExtras())
+                        settings.shouldShowTotalCookieProtectionCFR = false
+                    }
                     false -> TrackingProtection.tcpCfrImplicitDismissal.record(NoExtras())
                 }
             },
@@ -135,6 +252,11 @@ class BrowserToolbarCFRPresenter(
                         text = context.getString(R.string.tcp_cfr_message),
                         color = FirefoxTheme.colors.textOnColorPrimary,
                         style = FirefoxTheme.typography.body2,
+                        modifier = Modifier
+                            .semantics {
+                                testTagsAsResourceId = true
+                                testTag = "tcp_cfr.message"
+                            },
                     )
                 }
             },
@@ -143,16 +265,22 @@ class BrowserToolbarCFRPresenter(
                     Text(
                         text = context.getString(R.string.tcp_cfr_learn_more),
                         color = FirefoxTheme.colors.textOnColorPrimary,
-                        modifier = Modifier.clickable {
-                            context.components.useCases.tabsUseCases.selectOrAddTab.invoke(
-                                SupportUtils.getSumoURLForTopic(
-                                    context,
-                                    TOTAL_COOKIE_PROTECTION,
-                                ),
-                            )
-                            TrackingProtection.tcpSumoLinkClicked.record(NoExtras())
-                            tcpCfrPopup?.dismiss()
-                        },
+                        modifier = Modifier
+                            .semantics {
+                                testTagsAsResourceId = true
+                                testTag = "tcp_cfr.action"
+                            }
+                            .clickable {
+                                context.components.useCases.tabsUseCases.selectOrAddTab.invoke(
+                                    SupportUtils.getSumoURLForTopic(
+                                        context,
+                                        TOTAL_COOKIE_PROTECTION,
+                                    ),
+                                )
+                                TrackingProtection.tcpSumoLinkClicked.record(NoExtras())
+                                settings.shouldShowTotalCookieProtectionCFR = false
+                                popup?.dismiss()
+                            },
                         style = FirefoxTheme.typography.body2.copy(
                             textDecoration = TextDecoration.Underline,
                         ),
@@ -160,10 +288,66 @@ class BrowserToolbarCFRPresenter(
                 }
             },
         ).run {
-            settings.shouldShowTotalCookieProtectionCFR = false
-            tcpCfrPopup = this
+            popup = this
             show()
             TrackingProtection.tcpCfrShown.record(NoExtras())
         }
     }
+
+    @VisibleForTesting
+    internal fun showShoppingCFR(shouldShowOptedInCFR: Boolean) {
+        CFRPopup(
+            anchor = toolbar.findViewById(
+                R.id.mozac_browser_toolbar_page_actions,
+            ),
+            properties = CFRPopupProperties(
+                popupWidth = 475.dp,
+                popupAlignment = CFRPopup.PopupAlignment.BODY_CENTERED_IN_SCREEN,
+                popupBodyColors = listOf(
+                    getColor(context, R.color.fx_mobile_layer_color_gradient_start),
+                    getColor(context, R.color.fx_mobile_layer_color_gradient_end),
+                ),
+                popupVerticalOffset = CFR_TO_ANCHOR_VERTICAL_PADDING.dp,
+                dismissButtonColor = getColor(context, R.color.fx_mobile_icon_color_oncolor),
+                indicatorDirection = if (settings.toolbarPosition == ToolbarPosition.TOP) {
+                    CFRPopup.IndicatorDirection.UP
+                } else {
+                    CFRPopup.IndicatorDirection.DOWN
+                },
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false,
+            ),
+            onDismiss = {
+                when (it) {
+                    true -> {
+                        settings.shouldShowReviewQualityCheckCFR = false
+                    }
+                    false -> {}
+                }
+            },
+            text = {
+                FirefoxTheme {
+                    Text(
+                        text = if (shouldShowOptedInCFR) {
+                            stringResource(id = R.string.review_quality_check_second_cfr_message)
+                        } else {
+                            stringResource(id = R.string.review_quality_check_first_cfr_message)
+                        },
+                        color = FirefoxTheme.colors.textOnColorPrimary,
+                        style = FirefoxTheme.typography.body2,
+                    )
+                }
+            },
+        ).run {
+            popup = this
+            show()
+        }
+    }
+}
+
+/**
+ * The CFR to be shown in the toolbar.
+ */
+private enum class ToolbarCFR {
+    TCP, SHOPPING, SHOPPING_OPTED_IN, ERASE, NONE
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 08545bfcf..979afddb3 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -29,6 +29,7 @@ import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.home.HomeScreenViewModel
 
 /**
@@ -47,6 +48,11 @@ interface BrowserToolbarController {
      * @see [BrowserToolbarInteractor.onHomeButtonClicked]
      */
     fun handleHomeButtonClick()
+
+    /**
+     * @see [BrowserToolbarInteractor.onEraseButtonClicked]
+     */
+    fun handleEraseButtonClick()
 }
 
 @Suppress("LongParameterList")
@@ -180,6 +186,12 @@ class DefaultBrowserToolbarController(
         }
     }
 
+    override fun handleEraseButtonClick() {
+        homeViewModel.sessionToDelete = HomeFragment.ALL_PRIVATE_TABS
+        val directions = BrowserFragmentDirections.actionGlobalHome()
+        navController.navigate(directions)
+    }
+
     companion object {
         internal const val TELEMETRY_BROWSER_IDENTIFIER = "browserMenu"
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
index 5f35eafdf..d37346e9a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@@ -99,6 +99,7 @@ class DefaultToolbarIntegration(
         browserStore = context.components.core.store,
         settings = context.settings(),
         toolbar = toolbar,
+        isPrivate = isPrivate,
         sessionId = sessionId,
     )
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt
index 9bad62488..6bd6358c3 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt
@@ -27,6 +27,11 @@ interface BrowserToolbarInteractor {
      * Navigates to the Home screen. Called when a user taps on the Home button.
      */
     fun onHomeButtonClicked()
+
+    /**
+     * Deletes all tabs and navigates to the Home screen. Called when a user taps on the erase button.
+     */
+    fun onEraseButtonClicked()
 }
 
 /**
@@ -77,4 +82,8 @@ class DefaultBrowserToolbarInteractor(
     override fun onHomeButtonClicked() {
         browserToolbarController.handleHomeButtonClick()
     }
+
+    override fun onEraseButtonClicked() {
+        browserToolbarController.handleEraseButtonClick()
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt b/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
index 870440758..eee49fb60 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import mozilla.components.browser.icons.IconRequest
-import mozilla.components.browser.icons.compose.Loader
 import mozilla.components.browser.icons.compose.Placeholder
 import mozilla.components.browser.icons.compose.WithIcon
 import org.mozilla.fenix.components.components
@@ -47,10 +46,10 @@ fun Favicon(
             modifier = modifier,
         )
     } else {
-        components.core.icons.Loader(
+        components.core.icons.LoadableImage(
             url = url,
             isPrivate = isPrivate,
-            size = size.toIconRequestSize(),
+            iconSize = size.toIconRequestSize(),
         ) {
             Placeholder {
                 FaviconPlaceholder(
diff --git a/app/src/main/java/org/mozilla/fenix/compose/PagerIndicator.kt b/app/src/main/java/org/mozilla/fenix/compose/PagerIndicator.kt
index 301e8cb25..0493d69de 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/PagerIndicator.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/PagerIndicator.kt
@@ -49,7 +49,6 @@ import org.mozilla.fenix.theme.FirefoxTheme
 @Composable
 fun PagerIndicator(
     pagerState: PagerState,
-    pageCount: Int,
     modifier: Modifier = Modifier,
     activeColor: Color = FirefoxTheme.colors.indicatorActive,
     inactiveColor: Color = FirefoxTheme.colors.indicatorInactive,
@@ -68,7 +67,7 @@ fun PagerIndicator(
                 { it == pagerState.currentPage }
             }
 
-        repeat(pageCount) {
+        repeat(pagerState.pageCount) {
             Box(
                 modifier = Modifier
                     .size(6.dp)
@@ -104,8 +103,7 @@ private fun PagerIndicatorPreview() {
             Spacer(modifier = Modifier.height(8.dp))
 
             PagerIndicator(
-                pagerState = rememberPagerState(1),
-                pageCount = 3,
+                pagerState = rememberPagerState(1, pageCount = { 3 }),
                 activeColor = FirefoxTheme.colors.actionPrimary,
                 inactiveColor = FirefoxTheme.colors.actionSecondary,
                 modifier = Modifier.align(Alignment.CenterHorizontally),
@@ -122,8 +120,7 @@ private fun PagerIndicatorPreview() {
             Spacer(modifier = Modifier.height(8.dp))
 
             PagerIndicator(
-                pagerState = rememberPagerState(1),
-                pageCount = 3,
+                pagerState = rememberPagerState(1, pageCount = { 3 }),
                 activeColor = FirefoxTheme.colors.actionPrimary,
                 inactiveColor = FirefoxTheme.colors.actionSecondary,
                 leaveTrail = true,
@@ -141,8 +138,7 @@ private fun PagerIndicatorPreview() {
             Spacer(modifier = Modifier.height(8.dp))
 
             PagerIndicator(
-                pagerState = rememberPagerState(1),
-                pageCount = 3,
+                pagerState = rememberPagerState(1, pageCount = { 3 }),
                 modifier = Modifier.align(Alignment.CenterHorizontally),
             )
         }
diff --git a/app/src/main/java/org/mozilla/fenix/compose/String.kt b/app/src/main/java/org/mozilla/fenix/compose/String.kt
new file mode 100644
index 000000000..a62fd048f
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/compose/String.kt
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.compose
+
+import android.graphics.Typeface
+import android.text.style.StyleSpan
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.core.text.HtmlCompat
+import androidx.core.text.getSpans
+
+/**
+ * Method used to transform HTML strings containing bold style to [AnnotatedString] to be used inside composables.
+ */
+fun parseHtml(html: String): AnnotatedString {
+    val text = HtmlCompat.fromHtml(html, HtmlCompat.FROM_HTML_MODE_COMPACT)
+    return buildAnnotatedString {
+        append(text)
+        for (span in text.getSpans<StyleSpan>()) {
+            if (span.style == Typeface.BOLD) {
+                val start = text.getSpanStart(span)
+                val end = text.getSpanEnd(span)
+                addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/compose/TabThumbnail.kt b/app/src/main/java/org/mozilla/fenix/compose/TabThumbnail.kt
index 19a93f8f2..3e77de1d6 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/TabThumbnail.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/TabThumbnail.kt
@@ -61,6 +61,7 @@ fun TabThumbnail(
             request = ImageLoadRequest(
                 id = tab.id,
                 size = size,
+                isPrivate = tab.content.private,
             ),
             storage = storage,
             modifier = modifier,
diff --git a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt
index 08af4e961..d4df876dd 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt
@@ -97,7 +97,7 @@ private fun ThumbnailCardPreview() {
     FirefoxTheme {
         ThumbnailCard(
             url = "https://mozilla.com",
-            request = ImageLoadRequest("123", THUMBNAIL_SIZE),
+            request = ImageLoadRequest("123", THUMBNAIL_SIZE, false),
             storage = ThumbnailStorage(LocalContext.current),
             modifier = Modifier
                 .size(THUMBNAIL_SIZE.dp)
diff --git a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt
index 0ed83ee4a..1bdb4c553 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/ThumbnailImage.kt
@@ -109,7 +109,7 @@ private data class ThumbnailImageState(
 private fun ThumbnailImagePreview() {
     FirefoxTheme {
         ThumbnailImage(
-            request = ImageLoadRequest("1", 1),
+            request = ImageLoadRequest("1", 1, false),
             storage = ThumbnailStorage(LocalContext.current),
             modifier = Modifier,
             contentScale = ContentScale.Crop,
diff --git a/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt b/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt
index 6f7bc0fe2..c1105498f 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -82,12 +83,13 @@ import org.mozilla.fenix.theme.FirefoxTheme
  * enabled.
  * @param multiSelectionSelected Indicates if the item should be render as multi selection selected
  * option.
+ * @param shouldClickListen Whether or not the item should stop listening to click events.
  * @param onCloseClick Callback to handle the click event of the close button.
  * @param onMediaClick Callback to handle when the media item is clicked.
  * @param onClick Callback to handle when item is clicked.
- * @param onLongClick Callback to handle when item is long clicked.
+ * @param onLongClick Optional callback to handle when item is long clicked.
  */
-@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
 @Composable
 @Suppress("MagicNumber", "LongParameterList", "LongMethod")
 fun TabGridItem(
@@ -97,10 +99,11 @@ fun TabGridItem(
     isSelected: Boolean = false,
     multiSelectionEnabled: Boolean = false,
     multiSelectionSelected: Boolean = false,
+    shouldClickListen: Boolean = true,
     onCloseClick: (tab: TabSessionState) -> Unit,
     onMediaClick: (tab: TabSessionState) -> Unit,
     onClick: (tab: TabSessionState) -> Unit,
-    onLongClick: (tab: TabSessionState) -> Unit,
+    onLongClick: ((tab: TabSessionState) -> Unit)? = null,
 ) {
     val tabBorderModifier = if (isSelected) {
         Modifier.border(
@@ -143,6 +146,26 @@ fun TabGridItem(
                 .wrapContentSize()
                 .testTag(TabsTrayTestTag.tabItemRoot),
         ) {
+            val clickableModifier = if (onLongClick == null) {
+                Modifier.clickable(
+                    enabled = shouldClickListen,
+                    interactionSource = interactionSource,
+                    indication = rememberRipple(
+                        color = clickableColor(),
+                    ),
+                    onClick = { onClick(tab) },
+                )
+            } else {
+                Modifier.combinedClickable(
+                    enabled = shouldClickListen,
+                    interactionSource = interactionSource,
+                    indication = rememberRipple(
+                        color = clickableColor(),
+                    ),
+                    onLongClick = { onLongClick(tab) },
+                    onClick = { onClick(tab) },
+                )
+            }
             Card(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -150,17 +173,7 @@ fun TabGridItem(
                     .padding(4.dp)
                     .then(tabBorderModifier)
                     .padding(4.dp)
-                    .combinedClickable(
-                        interactionSource = interactionSource,
-                        indication = rememberRipple(
-                            color = when (isSystemInDarkTheme()) {
-                                true -> PhotonColors.White
-                                false -> PhotonColors.Black
-                            },
-                        ),
-                        onLongClick = { onLongClick(tab) },
-                        onClick = { onClick(tab) },
-                    ),
+                    .then(clickableModifier),
                 elevation = 0.dp,
                 shape = RoundedCornerShape(dimensionResource(id = R.dimen.tab_tray_grid_item_border_radius)),
                 border = BorderStroke(1.dp, FirefoxTheme.colors.borderPrimary),
@@ -251,6 +264,12 @@ fun TabGridItem(
     }
 }
 
+@Composable
+private fun clickableColor() = when (isSystemInDarkTheme()) {
+    true -> PhotonColors.White
+    false -> PhotonColors.Black
+}
+
 /**
  * Thumbnail specific for the [TabGridItem], which can be selected.
  *
@@ -320,7 +339,6 @@ private fun TabGridItemPreview() {
             onCloseClick = {},
             onMediaClick = {},
             onClick = {},
-            onLongClick = {},
         )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt b/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt
index 0bb1f1548..054cb4509 100644
--- a/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.compose.tabstray
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -40,7 +41,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.thumbnails.storage.ThumbnailStorage
@@ -67,10 +67,11 @@ import org.mozilla.fenix.theme.FirefoxTheme
  * enabled.
  * @param multiSelectionSelected Indicates if the item should be render as multi selection selected
  * option.
+ * @param shouldClickListen Whether or not the item should stop listening to click events.
  * @param onCloseClick Callback to handle the click event of the close button.
  * @param onMediaClick Callback to handle when the media item is clicked.
  * @param onClick Callback to handle when item is clicked.
- * @param onLongClick Callback to handle when item is long clicked.
+ * @param onLongClick Optional callback to handle when item is long clicked.
  */
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
 @Composable
@@ -82,10 +83,11 @@ fun TabListItem(
     isSelected: Boolean = false,
     multiSelectionEnabled: Boolean = false,
     multiSelectionSelected: Boolean = false,
+    shouldClickListen: Boolean = true,
     onCloseClick: (tab: TabSessionState) -> Unit,
     onMediaClick: (tab: TabSessionState) -> Unit,
     onClick: (tab: TabSessionState) -> Unit,
-    onLongClick: (tab: TabSessionState) -> Unit,
+    onLongClick: ((tab: TabSessionState) -> Unit)? = null,
 ) {
     val contentBackgroundColor = if (isSelected) {
         FirefoxTheme.colors.layerAccentNonOpaque
@@ -107,6 +109,27 @@ fun TabListItem(
     // Used to propagate the ripple effect to the whole tab
     val interactionSource = remember { MutableInteractionSource() }
 
+    val clickableModifier = if (onLongClick == null) {
+        Modifier.clickable(
+            enabled = shouldClickListen,
+            interactionSource = interactionSource,
+            indication = rememberRipple(
+                color = clickableColor(),
+            ),
+            onClick = { onClick(tab) },
+        )
+    } else {
+        Modifier.combinedClickable(
+            enabled = shouldClickListen,
+            interactionSource = interactionSource,
+            indication = rememberRipple(
+                color = clickableColor(),
+            ),
+            onLongClick = { onLongClick(tab) },
+            onClick = { onClick(tab) },
+        )
+    }
+
     SwipeToDismiss(
         state = dismissState,
         enabled = !multiSelectionEnabled,
@@ -119,17 +142,7 @@ fun TabListItem(
                 .fillMaxWidth()
                 .background(FirefoxTheme.colors.layer3)
                 .background(contentBackgroundColor)
-                .combinedClickable(
-                    interactionSource = interactionSource,
-                    indication = rememberRipple(
-                        color = when (isSystemInDarkTheme()) {
-                            true -> PhotonColors.White
-                            false -> PhotonColors.Black
-                        },
-                    ),
-                    onLongClick = { onLongClick(tab) },
-                    onClick = { onClick(tab) },
-                )
+                .then(clickableModifier)
                 .padding(start = 16.dp, top = 8.dp, bottom = 8.dp)
                 .testTag(TabsTrayTestTag.tabItemRoot),
             verticalAlignment = Alignment.CenterVertically,
@@ -152,8 +165,7 @@ fun TabListItem(
                 Text(
                     text = tab.toDisplayTitle().take(MAX_URI_LENGTH),
                     color = FirefoxTheme.colors.textPrimary,
-                    fontSize = 16.sp,
-                    letterSpacing = 0.0.sp,
+                    style = FirefoxTheme.typography.body1,
                     overflow = TextOverflow.Ellipsis,
                     maxLines = 2,
                 )
@@ -161,8 +173,7 @@ fun TabListItem(
                 Text(
                     text = tab.content.url.toShortUrl(),
                     color = FirefoxTheme.colors.textSecondary,
-                    fontSize = 14.sp,
-                    letterSpacing = 0.0.sp,
+                    style = FirefoxTheme.typography.body2,
                     overflow = TextOverflow.Ellipsis,
                     maxLines = 1,
                 )
@@ -191,6 +202,12 @@ fun TabListItem(
     }
 }
 
+@Composable
+private fun clickableColor() = when (isSystemInDarkTheme()) {
+    true -> PhotonColors.White
+    false -> PhotonColors.Black
+}
+
 @Composable
 @Suppress("LongParameterList")
 private fun Thumbnail(
@@ -263,7 +280,6 @@ private fun TabListItemPreview() {
             onCloseClick = {},
             onMediaClick = {},
             onClick = {},
-            onLongClick = {},
         )
     }
 }
@@ -279,7 +295,6 @@ private fun SelectedTabListItemPreview() {
             onCloseClick = {},
             onMediaClick = {},
             onClick = {},
-            onLongClick = {},
             multiSelectionEnabled = true,
             multiSelectionSelected = true,
         )
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
index 429ff9eb0..2b70d5551 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
@@ -4,7 +4,11 @@
 
 package org.mozilla.fenix.customtabs
 
+import android.app.assist.AssistContent
 import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDirections
@@ -117,4 +121,11 @@ open class ExternalAppBrowserActivity : HomeActivity() {
     internal fun getExternalTabId(): String? {
         return getIntentSessionId(SafeIntent(intent))
     }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onProvideAssistContent(outContent: AssistContent?) {
+        super.onProvideAssistContent(outContent)
+        val currentTabUrl = getExternalTab()?.content?.url
+        outContent?.webUri = currentTabUrl?.let { Uri.parse(it) }
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/ext/AppState.kt b/app/src/main/java/org/mozilla/fenix/ext/AppState.kt
index 478022cbe..d0491be7f 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/AppState.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/AppState.kt
@@ -187,9 +187,8 @@ fun AppState.shouldShowRecentTabs(settings: Settings): Boolean {
 }
 
 /**
- * Determines whether a recent synced tab section should be shown, based on user preference
- * and the availability of Synced tabs.
+ * Determines whether a recent synced tab section should be shown, based on the availability of Synced tabs.
  */
-fun AppState.shouldShowRecentSyncedTabs(settings: Settings): Boolean {
-    return (settings.enableTaskContinuityEnhancements && recentSyncedTabState is RecentSyncedTabState.Success)
+fun AppState.shouldShowRecentSyncedTabs(): Boolean {
+    return recentSyncedTabState is RecentSyncedTabState.Success
 }
diff --git a/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt b/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
index f538ba6ec..cbb1a0483 100644
--- a/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
+++ b/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
@@ -6,8 +6,8 @@ package org.mozilla.fenix.extension
 
 import android.content.Context
 import android.view.Gravity
-import android.view.View
 import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
@@ -16,15 +16,16 @@ import kotlinx.coroutines.flow.mapNotNull
 import mozilla.components.browser.state.action.WebExtensionAction
 import mozilla.components.browser.state.state.extension.WebExtensionPromptRequest
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.webextension.WebExtensionInstallException
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.toInstalledState
 import io.github.forkmaintainers.iceraven.components.PagedAddonInstallationDialogFragment as AddonInstallationDialogFragment
 import mozilla.components.feature.addons.ui.PermissionsDialogFragment
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.support.ktx.android.content.appVersionName
+import mozilla.components.ui.widgets.withCenterAlignedButtons
 import org.mozilla.fenix.R
-import org.mozilla.fenix.addons.showSnackBar
-import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.theme.ThemeManager
 import java.lang.ref.WeakReference
@@ -34,9 +35,7 @@ import java.lang.ref.WeakReference
  */
 class WebExtensionPromptFeature(
     private val store: BrowserStore,
-    private val provideAddons: suspend () -> List<Addon>?,
     private val context: Context,
-    private val snackBarParentView: View,
     private val fragmentManager: FragmentManager,
     private val onAddonChanged: (Addon) -> Unit = {},
 ) : LifecycleAwareFeature {
@@ -56,50 +55,124 @@ class WebExtensionPromptFeature(
             flow.mapNotNull { state ->
                 state.webExtensionPromptRequest
             }.distinctUntilChanged().collect { promptRequest ->
-                val addon = provideAddons()?.find { addon ->
-                    addon.id == promptRequest.extension.id
-                }
+
                 when (promptRequest) {
-                    is WebExtensionPromptRequest.Permissions -> handlePermissionRequest(
-                        addon,
-                        promptRequest,
-                    )
+                    is WebExtensionPromptRequest.AfterInstallation -> {
+                        handleAfterInstallationRequest(promptRequest)
+                    }
 
-                    is WebExtensionPromptRequest.PostInstallation -> handlePostInstallationRequest(
-                        addon?.copy(installedState = promptRequest.extension.toInstalledState()),
-                    )
+                    is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed -> {
+                        handleBeforeInstallationRequest(promptRequest)
+                        consumePromptRequest()
+                    }
                 }
             }
         }
         tryToReAttachButtonHandlersToPreviousDialog()
     }
 
+    private fun handleAfterInstallationRequest(promptRequest: WebExtensionPromptRequest.AfterInstallation) {
+        // The install flow in Fenix relies on an [Addon] object so let's convert the (GeckoView)
+        // extension into a minimal add-on. The missing metadata will be fetched when the user
+        // opens the add-ons manager.
+        val addon = Addon.newFromWebExtension(promptRequest.extension)
+        when (promptRequest) {
+            is WebExtensionPromptRequest.AfterInstallation.Permissions -> handlePermissionRequest(
+                addon,
+                promptRequest,
+            )
+            is WebExtensionPromptRequest.AfterInstallation.PostInstallation -> handlePostInstallationRequest(
+                addon.copy(installedState = promptRequest.extension.toInstalledState()),
+            )
+        }
+    }
+
+    private fun handleBeforeInstallationRequest(promptRequest: WebExtensionPromptRequest.BeforeInstallation) {
+        when (promptRequest) {
+            is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed -> {
+                handleInstallationFailedRequest(
+                    exception = promptRequest.exception,
+                )
+                consumePromptRequest()
+            }
+        }
+    }
+
     private fun handlePostInstallationRequest(
-        addon: Addon?,
+        addon: Addon,
     ) {
-        if (addon == null) {
-            consumePromptRequest()
-            return
-        }
         showPostInstallationDialog(addon)
     }
 
     private fun handlePermissionRequest(
-        addon: Addon?,
-        promptRequest: WebExtensionPromptRequest.Permissions,
+        addon: Addon,
+        promptRequest: WebExtensionPromptRequest.AfterInstallation.Permissions,
     ) {
         if (hasExistingPermissionDialogFragment()) return
+        showPermissionDialog(
+            addon,
+            promptRequest,
+        )
+    }
 
-        if (addon == null) {
-            promptRequest.onConfirm(false)
-            consumePromptRequest()
-            showUnsupportedError()
-        } else {
-            showPermissionDialog(
-                addon,
-                promptRequest,
-            )
+    @VisibleForTesting
+    internal fun handleInstallationFailedRequest(
+        exception: WebExtensionInstallException,
+    ) {
+        val addonName = exception.extensionName ?: ""
+        var title = context.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val message = when (exception) {
+            is WebExtensionInstallException.Blocklisted -> {
+                context.getString(R.string.mozac_feature_addons_blocklisted_1, addonName)
+            }
+
+            is WebExtensionInstallException.UserCancelled -> {
+                // We don't want to show an error message when users cancel installation.
+                return
+            }
+
+            is WebExtensionInstallException.Unknown -> {
+                // Making sure we don't have a
+                // Title = Failed to install
+                // Message = Failed to install $addonName
+                title = ""
+                if (addonName.isNotEmpty()) {
+                    context.getString(R.string.mozac_feature_addons_failed_to_install, addonName)
+                } else {
+                    context.getString(R.string.mozac_feature_addons_failed_to_install_generic)
+                }
+            }
+
+            is WebExtensionInstallException.NetworkFailure -> {
+                context.getString(R.string.mozac_feature_addons_failed_to_install_network_error)
+            }
+
+            is WebExtensionInstallException.CorruptFile -> {
+                context.getString(R.string.mozac_feature_addons_failed_to_install_corrupt_error)
+            }
+
+            is WebExtensionInstallException.NotSigned -> {
+                context.getString(
+                    R.string.mozac_feature_addons_failed_to_install_not_signed_error,
+                )
+            }
+
+            is WebExtensionInstallException.Incompatible -> {
+                val appName = context.getString(R.string.app_name)
+                val version = context.appVersionName
+                context.getString(
+                    R.string.mozac_feature_addons_failed_to_install_incompatible_error,
+                    addonName,
+                    appName,
+                    version,
+                )
+            }
         }
+
+        showDialog(
+            title = title,
+            message = message,
+        )
     }
 
     /**
@@ -112,7 +185,7 @@ class WebExtensionPromptFeature(
     @VisibleForTesting
     internal fun showPermissionDialog(
         addon: Addon,
-        promptRequest: WebExtensionPromptRequest.Permissions,
+        promptRequest: WebExtensionPromptRequest.AfterInstallation.Permissions,
     ) {
         if (!isInstallationInProgress && !hasExistingPermissionDialogFragment()) {
             val dialog = PermissionsDialogFragment.newInstance(
@@ -145,21 +218,12 @@ class WebExtensionPromptFeature(
         }
     }
 
-    @VisibleForTesting
-    internal fun showUnsupportedError() {
-        showSnackBar(
-            snackBarParentView,
-            context.getString(R.string.addon_not_supported_error),
-            FenixSnackbar.LENGTH_LONG,
-        )
-    }
-
     private fun tryToReAttachButtonHandlersToPreviousDialog() {
         findPreviousPermissionDialogFragment()?.let { dialog ->
             dialog.onPositiveButtonClicked = { addon ->
                 store.state.webExtensionPromptRequest?.let { promptRequest ->
-                    if (addon.id == promptRequest.extension.id &&
-                        promptRequest is WebExtensionPromptRequest.Permissions
+                    if (promptRequest is WebExtensionPromptRequest.AfterInstallation.Permissions &&
+                        addon.id == promptRequest.extension.id
                     ) {
                         handleApprovedPermissions(promptRequest)
                     }
@@ -167,7 +231,7 @@ class WebExtensionPromptFeature(
             }
             dialog.onNegativeButtonClicked = {
                 store.state.webExtensionPromptRequest?.let { promptRequest ->
-                    if (promptRequest is WebExtensionPromptRequest.Permissions) {
+                    if (promptRequest is WebExtensionPromptRequest.AfterInstallation.Permissions) {
                         handleDeniedPermissions(promptRequest)
                     }
                 }
@@ -177,8 +241,8 @@ class WebExtensionPromptFeature(
         findPreviousPostInstallationDialogFragment()?.let { dialog ->
             dialog.onConfirmButtonClicked = { addon, allowInPrivateBrowsing ->
                 store.state.webExtensionPromptRequest?.let { promptRequest ->
-                    if (addon.id == promptRequest.extension.id &&
-                        promptRequest is WebExtensionPromptRequest.PostInstallation
+                    if (promptRequest is WebExtensionPromptRequest.AfterInstallation.PostInstallation &&
+                        addon.id == promptRequest.extension.id
                     ) {
                         handlePostInstallationButtonClicked(
                             allowInPrivateBrowsing = allowInPrivateBrowsing,
@@ -196,12 +260,12 @@ class WebExtensionPromptFeature(
         }
     }
 
-    private fun handleDeniedPermissions(promptRequest: WebExtensionPromptRequest.Permissions) {
+    private fun handleDeniedPermissions(promptRequest: WebExtensionPromptRequest.AfterInstallation.Permissions) {
         promptRequest.onConfirm(false)
         consumePromptRequest()
     }
 
-    private fun handleApprovedPermissions(promptRequest: WebExtensionPromptRequest.Permissions) {
+    private fun handleApprovedPermissions(promptRequest: WebExtensionPromptRequest.AfterInstallation.Permissions) {
         promptRequest.onConfirm(true)
         consumePromptRequest()
     }
@@ -290,6 +354,24 @@ class WebExtensionPromptFeature(
         consumePromptRequest()
     }
 
+    @VisibleForTesting
+    internal fun showDialog(
+        title: String,
+        message: String,
+    ) {
+        context.let {
+            AlertDialog.Builder(it)
+                .setTitle(title)
+                .setPositiveButton(android.R.string.ok) { _, _ -> }
+                .setCancelable(false)
+                .setMessage(
+                    message,
+                )
+                .show()
+                .withCenterAlignedButtons()
+        }
+    }
+
     companion object {
         private const val PERMISSIONS_DIALOG_FRAGMENT_TAG = "ADDONS_PERMISSIONS_DIALOG_FRAGMENT"
         private const val POST_INSTALLATION_DIALOG_FRAGMENT_TAG =
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index c7c0e1f04..8d7161e57 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -10,16 +10,27 @@ import android.content.res.Configuration
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.PopupWindow
 import androidx.annotation.VisibleForTesting
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.getColor
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -47,6 +58,8 @@ import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.compose.cfr.CFRPopup
+import mozilla.components.compose.cfr.CFRPopupProperties
 import mozilla.components.concept.storage.FrecencyThresholdOption
 import mozilla.components.concept.sync.AccountObserver
 import mozilla.components.concept.sync.AuthType
@@ -61,6 +74,7 @@ import mozilla.components.lib.state.ext.consumeFlow
 import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import mozilla.components.ui.colors.PhotonColors
 import org.mozilla.fenix.GleanMetrics.HomeScreen
 import org.mozilla.fenix.GleanMetrics.Homepage
 import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcutCfr
@@ -77,10 +91,8 @@ import org.mozilla.fenix.databinding.FragmentHomeBinding
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.containsQueryParameters
 import org.mozilla.fenix.ext.hideToolbar
-import org.mozilla.fenix.ext.increaseTapArea
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
-import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.scaleToBottomOfView
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.pocket.DefaultPocketStoriesController
@@ -111,11 +123,11 @@ import org.mozilla.fenix.perf.runBlockingIncrement
 import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController
 import org.mozilla.fenix.search.toolbar.SearchSelectorMenu
 import org.mozilla.fenix.tabstray.TabsTrayAccessPoint
+import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD
 import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wallpapers.Wallpaper
 import java.lang.ref.WeakReference
-import kotlin.math.min
 
 @Suppress("TooManyFunctions", "LargeClass")
 class HomeFragment : Fragment() {
@@ -294,21 +306,19 @@ class HomeFragment : Fragment() {
                 view = binding.root,
             )
 
-            if (requireContext().settings().enableTaskContinuityEnhancements) {
-                recentSyncedTabFeature.set(
-                    feature = RecentSyncedTabFeature(
-                        context = requireContext(),
-                        appStore = requireComponents.appStore,
-                        syncStore = requireComponents.backgroundServices.syncStore,
-                        storage = requireComponents.backgroundServices.syncedTabsStorage,
-                        accountManager = requireComponents.backgroundServices.accountManager,
-                        historyStorage = requireComponents.core.historyStorage,
-                        coroutineScope = viewLifecycleOwner.lifecycleScope,
-                    ),
-                    owner = viewLifecycleOwner,
-                    view = binding.root,
-                )
-            }
+            recentSyncedTabFeature.set(
+                feature = RecentSyncedTabFeature(
+                    context = requireContext(),
+                    appStore = requireComponents.appStore,
+                    syncStore = requireComponents.backgroundServices.syncStore,
+                    storage = requireComponents.backgroundServices.syncedTabsStorage,
+                    accountManager = requireComponents.backgroundServices.accountManager,
+                    historyStorage = requireComponents.core.historyStorage,
+                    coroutineScope = viewLifecycleOwner.lifecycleScope,
+                ),
+                owner = viewLifecycleOwner,
+                view = binding.root,
+            )
         }
 
         if (requireContext().settings().showRecentBookmarksFeature) {
@@ -664,7 +674,11 @@ class HomeFragment : Fragment() {
         }
 
         val snackbarMessage = if (sessionCode == ALL_PRIVATE_TABS) {
-            getString(R.string.snackbar_private_tabs_closed)
+            if (requireContext().settings().feltPrivateBrowsingEnabled) {
+                getString(R.string.snackbar_private_data_deleted)
+            } else {
+                getString(R.string.snackbar_private_tabs_closed)
+            }
         } else {
             getString(R.string.snackbar_tabs_closed)
         }
@@ -826,49 +840,100 @@ class HomeFragment : Fragment() {
         requireComponents.useCases.sessionUseCases.updateLastAccess()
     }
 
-    @SuppressLint("InflateParams")
+    private var recommendPrivateBrowsingCFR: CFRPopup? = null
+
+    @OptIn(ExperimentalComposeUiApi::class)
+    @Suppress("LongMethod")
     private fun recommendPrivateBrowsingShortcut() {
         context?.let { context ->
-            val layout = LayoutInflater.from(context)
-                .inflate(R.layout.pbm_shortcut_popup, null)
-            val privateBrowsingRecommend =
-                PopupWindow(
-                    layout,
-                    min(
-                        (resources.displayMetrics.widthPixels / CFR_WIDTH_DIVIDER).toInt(),
-                        (resources.displayMetrics.heightPixels / CFR_WIDTH_DIVIDER).toInt(),
+            CFRPopup(
+                anchor = binding.privateBrowsingButton,
+                properties = CFRPopupProperties(
+                    popupWidth = 256.dp,
+                    popupAlignment = CFRPopup.PopupAlignment.INDICATOR_CENTERED_IN_ANCHOR,
+                    popupBodyColors = listOf(
+                        getColor(context, R.color.fx_mobile_layer_color_gradient_end),
+                        getColor(context, R.color.fx_mobile_layer_color_gradient_start),
                     ),
-                    LinearLayout.LayoutParams.WRAP_CONTENT,
-                    true,
-                )
-            layout.findViewById<Button>(R.id.cfr_pos_button).apply {
-                this.increaseTapArea(CFR_TAP_INCREASE_DPS)
-
-                setOnClickListener {
-                    PrivateBrowsingShortcutCfr.addShortcut.record(NoExtras())
-                    PrivateShortcutCreateManager.createPrivateShortcut(context)
-                    privateBrowsingRecommend.dismiss()
-                }
-            }
-            layout.findViewById<Button>(R.id.cfr_neg_button).apply {
-                setOnClickListener {
+                    showDismissButton = false,
+                    dismissButtonColor = getColor(context, R.color.fx_mobile_icon_color_oncolor),
+                    indicatorDirection = CFRPopup.IndicatorDirection.UP,
+                ),
+                onDismiss = {
                     PrivateBrowsingShortcutCfr.cancel.record()
-                    privateBrowsingRecommend.dismiss()
-                }
-            }
-            // We want to show the popup only after privateBrowsingButton is available.
-            // Otherwise, we will encounter an activity token error.
-            binding.privateBrowsingButton.post {
-                runIfFragmentIsAttached {
                     context.settings().showedPrivateModeContextualFeatureRecommender = true
                     context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis()
-                    privateBrowsingRecommend.showAsDropDown(
-                        binding.privateBrowsingButton,
-                        0,
-                        CFR_Y_OFFSET,
-                        Gravity.TOP or Gravity.END,
-                    )
-                }
+                    recommendPrivateBrowsingCFR?.dismiss()
+                },
+                text = {
+                    FirefoxTheme {
+                        Text(
+                            text = context.getString(R.string.private_mode_cfr_message_2),
+                            color = FirefoxTheme.colors.textOnColorPrimary,
+                            style = FirefoxTheme.typography.headline7,
+                            modifier = Modifier
+                                .semantics {
+                                    testTagsAsResourceId = true
+                                    testTag = "private.message"
+                                },
+                        )
+                    }
+                },
+                action = {
+                    FirefoxTheme {
+                        TextButton(
+                            onClick = {
+                                PrivateBrowsingShortcutCfr.addShortcut.record(NoExtras())
+                                PrivateShortcutCreateManager.createPrivateShortcut(context)
+                                context.settings().showedPrivateModeContextualFeatureRecommender = true
+                                context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis()
+                                recommendPrivateBrowsingCFR?.dismiss()
+                            },
+                            colors = ButtonDefaults.buttonColors(backgroundColor = PhotonColors.LightGrey30),
+                            shape = RoundedCornerShape(8.dp),
+                            modifier = Modifier
+                                .padding(top = 16.dp)
+                                .heightIn(36.dp)
+                                .fillMaxWidth()
+                                .semantics {
+                                    testTagsAsResourceId = true
+                                    testTag = "private.add"
+                                },
+                        ) {
+                            Text(
+                                text = context.getString(R.string.private_mode_cfr_pos_button_text),
+                                color = PhotonColors.DarkGrey50,
+                                style = FirefoxTheme.typography.headline7,
+                                textAlign = TextAlign.Center,
+                            )
+                        }
+                        TextButton(
+                            onClick = {
+                                PrivateBrowsingShortcutCfr.cancel.record()
+                                context.settings().showedPrivateModeContextualFeatureRecommender = true
+                                context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis()
+                                recommendPrivateBrowsingCFR?.dismiss()
+                            },
+                            modifier = Modifier
+                                .heightIn(36.dp)
+                                .fillMaxWidth()
+                                .semantics {
+                                    testTagsAsResourceId = true
+                                    testTag = "private.cancel"
+                                },
+                        ) {
+                            Text(
+                                text = context.getString(R.string.cfr_neg_button_text),
+                                textAlign = TextAlign.Center,
+                                color = FirefoxTheme.colors.textOnColorPrimary,
+                                style = FirefoxTheme.typography.headline7,
+                            )
+                        }
+                    }
+                },
+            ).run {
+                recommendPrivateBrowsingCFR = this
+                show()
             }
         }
     }
@@ -993,11 +1058,6 @@ class HomeFragment : Fragment() {
         private const val SCROLL_TO_COLLECTION = "scrollToCollection"
         private const val ANIM_SCROLL_DELAY = 100L
 
-        private const val CFR_WIDTH_DIVIDER = 1.7
-        private const val CFR_Y_OFFSET = -20
-
-        private const val CFR_TAP_INCREASE_DPS = 6
-
         // Sponsored top sites titles and search engine names used for filtering
         const val AMAZON_SPONSORED_TITLE = "Amazon"
         const val AMAZON_SEARCH_ENGINE_NAME = "Amazon.com"
diff --git a/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt b/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
index 07eef8357..a5eb2e49b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/TabCounterView.kt
@@ -20,6 +20,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.components.toolbar.FenixTabCounterMenu
 import org.mozilla.fenix.ext.nav
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.tabstray.Page
 
 /**
@@ -82,13 +83,18 @@ class TabCounterView(
      * browsing mode.
      */
     fun update(browserState: BrowserState) {
-        val tabCount = if (browsingModeManager.mode.isPrivate) {
+        val isPrivate = browsingModeManager.mode.isPrivate
+        val tabCount = if (isPrivate) {
             browserState.privateTabs.size
         } else {
             browserState.normalTabs.size
         }
 
         tabCounter.setCountWithAnimation(tabCount)
+
+        if (context.settings().feltPrivateBrowsingEnabled) {
+            tabCounter.toggleCounterMask(isPrivate)
+        }
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt
index 28361adc4..d999471e4 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt
@@ -120,6 +120,7 @@ fun RecentSyncedTab(
                             request = ImageLoadRequest(
                                 id = tab.url.hashCode().toString(),
                                 size = LocalDensity.current.run { THUMBNAIL_SIZE.dp.toPx().toInt() },
+                                isPrivate = false,
                             ),
                             storage = storage,
                             modifier = imageModifier,
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
index cc7add983..258ded268 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
@@ -324,6 +324,7 @@ class SessionControlAdapter(
             is PocketCategoriesViewHolder,
             is PocketRecommendationsHeaderViewHolder,
             is PocketStoriesViewHolder,
+            is TopSitesViewHolder,
             -> {
                 // no op
                 // This previously called "composeView.disposeComposition" which would have the
@@ -331,11 +332,6 @@ class SessionControlAdapter(
                 // This View already listens and maps store updates. Avoid creating and binding new Views.
                 // The composition will live until the ViewTreeLifecycleOwner to which it's attached to is destroyed.
             }
-            is TopSitesViewHolder -> {
-                // Dispose the underlying composition immediately.
-                // This ViewHolder can be removed / re-added and we need it to show a fresh new composition.
-                holder.composeView.disposeComposition()
-            }
             is CollectionViewHolder -> {
                 // Dispose the underlying composition immediately.
                 // This ViewHolder can be removed / re-added and we need it to show a fresh new composition.
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
index 03e37182a..6eadcc4d2 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
@@ -140,7 +140,7 @@ private fun AppState.toAdapterList(settings: Settings): List<AdapterItem> = when
         showCollectionPlaceholder,
         messaging.messageToShow[FenixMessageSurfaceId.HOMESCREEN],
         shouldShowRecentTabs(settings),
-        shouldShowRecentSyncedTabs(settings),
+        shouldShowRecentSyncedTabs(),
         recentHistory,
         pocketStories,
         firstFrameDrawn,
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/FeltPrivacyInfoCard.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/FeltPrivacyInfoCard.kt
new file mode 100644
index 000000000..4edd382be
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/FeltPrivacyInfoCard.kt
@@ -0,0 +1,88 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.home.sessioncontrol.viewholders
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Card
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.LinkText
+import org.mozilla.fenix.compose.LinkTextState
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * Total Private Browsing Mode homepage informational card.
+ *
+ * @param onLearnMoreClick Invoked when the user clicks on the who can see my activity link.
+ */
+@Composable
+fun FeltPrivacyModeInfoCard(
+    onLearnMoreClick: () -> Unit,
+) {
+    Card(
+        modifier = Modifier
+            .wrapContentHeight(),
+        backgroundColor = FirefoxTheme.colors.layerAccentNonOpaque,
+        shape = RoundedCornerShape(8.dp),
+        elevation = 5.dp,
+    ) {
+        Column(
+            modifier = Modifier.padding(16.dp),
+        ) {
+            Text(
+                text = stringResource(id = R.string.felt_privacy_desc_card_title),
+                style = FirefoxTheme.typography.headline7,
+                color = FirefoxTheme.colors.textPrimary,
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            LinkText(
+                text = stringResource(
+                    id = R.string.felt_privacy_info_card_subtitle,
+                    stringResource(id = R.string.app_name),
+                    stringResource(id = R.string.felt_privacy_info_card_subtitle_link_text),
+                ),
+                linkTextState = LinkTextState(
+                    text = stringResource(id = R.string.felt_privacy_info_card_subtitle_link_text),
+                    url = "",
+                    onClick = { onLearnMoreClick() },
+                ),
+                style = FirefoxTheme.typography.body2.copy(
+                    color = FirefoxTheme.colors.textPrimary,
+                ),
+                linkTextDecoration = TextDecoration.Underline,
+            )
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun FeltPrivacyModeDescriptionPreview() {
+    FirefoxTheme {
+        Column(
+            modifier = Modifier.background(FirefoxTheme.colors.layer1)
+                .fillMaxSize(),
+        ) {
+            FeltPrivacyModeInfoCard(
+                onLearnMoreClick = {},
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
index 08af2e6aa..ec1b0ea0d 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.LifecycleOwner
 import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.ComposeViewHolder
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.privatebrowsing.interactor.PrivateBrowsingInteractor
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -51,9 +52,17 @@ class PrivateBrowsingDescriptionViewHolder(
 
     @Composable
     override fun Content() {
-        PrivateBrowsingDescription(
-            onLearnMoreClick = interactor::onLearnMoreClicked,
-        )
+        val settings = composeView.context.settings()
+
+        if (settings.feltPrivateBrowsingEnabled) {
+            FeltPrivacyModeInfoCard(
+                onLearnMoreClick = interactor::onLearnMoreClicked,
+            )
+        } else {
+            PrivateBrowsingDescription(
+                onLearnMoreClick = interactor::onLearnMoreClicked,
+            )
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt
index 197df834a..a701fdfc2 100644
--- a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt
@@ -34,6 +34,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
@@ -43,8 +44,11 @@ import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -87,9 +91,9 @@ private const val TOP_SITES_FAVICON_SIZE = 36
  * @param onSponsorPrivacyClicked Invoked when the user clicks on the "Our sponsors & your privacy"
  * menu item.
  */
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "LongMethod")
 fun TopSites(
     topSites: List<TopSite>,
     topSiteColors: TopSiteColors = TopSiteColors.colors(),
@@ -100,23 +104,34 @@ fun TopSites(
     onRemoveTopSiteClicked: (topSite: TopSite) -> Unit,
     onSettingsClicked: () -> Unit,
     onSponsorPrivacyClicked: () -> Unit,
+    onTopSitesItemBound: () -> Unit,
 ) {
+    val pageCount = ceil((topSites.size.toDouble() / TOP_SITES_PER_PAGE)).toInt()
+
     Column(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .semantics {
+                testTagsAsResourceId = true
+            }
+            .testTag(TopSitesTestTag.topSites),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        val pagerState = rememberPagerState()
-        val pageCount = ceil((topSites.size.toDouble() / TOP_SITES_PER_PAGE)).toInt()
+        val pagerState = rememberPagerState(
+            pageCount = { pageCount },
+        )
 
         Box(
             modifier = Modifier.fillMaxWidth(),
             contentAlignment = Alignment.Center,
         ) {
             HorizontalPager(
-                pageCount = pageCount,
                 state = pagerState,
             ) { page ->
-                Column {
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
                     val topSitesWindows = topSites.windowed(
                         size = TOP_SITES_PER_PAGE,
                         step = TOP_SITES_PER_PAGE,
@@ -140,6 +155,7 @@ fun TopSites(
                                     topSiteColors = topSiteColors,
                                     onTopSiteClick = { item -> onTopSiteClick(item) },
                                     onTopSiteLongClick = onTopSiteLongClick,
+                                    onTopSitesItemBound = onTopSitesItemBound,
                                 )
                             }
                         }
@@ -150,12 +166,11 @@ fun TopSites(
             }
         }
 
-        if (pageCount > 1) {
+        if (pagerState.pageCount > 1) {
             Spacer(modifier = Modifier.height(8.dp))
 
             PagerIndicator(
                 pagerState = pagerState,
-                pageCount = pageCount,
                 modifier = Modifier.padding(horizontal = 16.dp),
                 spacing = 4.dp,
             )
@@ -228,8 +243,8 @@ data class TopSiteColors(
  * @param onTopSiteClick Invoked when the user clicks on a top site.
  * @param onTopSiteLongClick Invoked when the user long clicks on a top site.
  */
-@Suppress("LongParameterList")
-@OptIn(ExperimentalFoundationApi::class)
+@Suppress("LongParameterList", "LongMethod")
+@OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 private fun TopSiteItem(
     topSite: TopSite,
@@ -238,10 +253,17 @@ private fun TopSiteItem(
     topSiteColors: TopSiteColors,
     onTopSiteClick: (TopSite) -> Unit,
     onTopSiteLongClick: (TopSite) -> Unit,
+    onTopSitesItemBound: () -> Unit,
 ) {
     var menuExpanded by remember { mutableStateOf(false) }
 
-    Box {
+    Box(
+        modifier = Modifier
+            .semantics {
+                testTagsAsResourceId = true
+            }
+            .testTag(TopSitesTestTag.topSiteItemRoot),
+    ) {
         Column(
             modifier = Modifier
                 .combinedClickable(
@@ -280,6 +302,11 @@ private fun TopSiteItem(
                 }
 
                 Text(
+                    modifier = Modifier
+                        .semantics {
+                            testTagsAsResourceId = true
+                        }
+                        .testTag(TopSitesTestTag.topSiteTitle),
                     text = topSite.title ?: topSite.url,
                     color = topSiteColors.titleTextColor,
                     overflow = TextOverflow.Ellipsis,
@@ -302,6 +329,8 @@ private fun TopSiteItem(
         }
 
         ContextualMenu(
+            modifier = Modifier
+                .testTag(TopSitesTestTag.topSiteContextualMenu),
             menuItems = menuItems,
             showMenu = menuExpanded,
             onDismissRequest = { menuExpanded = false },
@@ -313,6 +342,10 @@ private fun TopSiteItem(
             }
         }
     }
+
+    LaunchedEffect(Unit) {
+        onTopSitesItemBound()
+    }
 }
 
 /**
@@ -338,19 +371,10 @@ private fun TopSiteFaviconCard(
                 color = backgroundColor,
                 shape = RoundedCornerShape(4.dp),
             ) {
-                val drawableForUrl = getDrawableForUrl(topSite.url)
-                when {
-                    drawableForUrl != null -> {
-                        FaviconImage(painterResource(drawableForUrl))
-                    }
-
-                    topSite is TopSite.Provided -> {
-                        FaviconBitmap(topSite)
-                    }
-
-                    else -> {
-                        FaviconDefault(topSite.url)
-                    }
+                if (topSite is TopSite.Provided) {
+                    FaviconBitmap(topSite)
+                } else {
+                    FavIconForUrl(topSite.url)
                 }
             }
         }
@@ -384,8 +408,13 @@ private fun FaviconBitmap(topSite: TopSite.Provided) {
     }
 
     when (val uiState = faviconBitmapUiState) {
-        is FaviconBitmapUiState.Loading, FaviconBitmapUiState.Error -> FaviconDefault(topSite.url)
         is FaviconBitmapUiState.Data -> FaviconImage(BitmapPainter(uiState.imageBitmap))
+        is FaviconBitmapUiState.Error -> FaviconDefault(topSite.url)
+        is FaviconBitmapUiState.Loading -> {
+            // no-op
+            // Don't update the icon while loading else the top site icon could have a 'flashing' effect
+            // caused by the 'place holder letter' icon being immediately updated with the desired bitmap.
+        }
     }
 }
 
@@ -400,16 +429,18 @@ private fun FaviconDefault(url: String) {
     Favicon(url = url, size = TOP_SITES_FAVICON_SIZE.dp)
 }
 
-private fun getDrawableForUrl(url: String) =
+@Composable
+private fun FavIconForUrl(url: String) {
     when (url) {
-        SupportUtils.POCKET_TRENDING_URL -> R.drawable.ic_pocket
-        SupportUtils.BAIDU_URL -> R.drawable.ic_baidu
-        SupportUtils.JD_URL -> R.drawable.ic_jd
-        SupportUtils.PDD_URL -> R.drawable.ic_pdd
-        SupportUtils.TC_URL -> R.drawable.ic_tc
-        SupportUtils.MEITUAN_URL -> R.drawable.ic_meituan
-        else -> null
+        SupportUtils.POCKET_TRENDING_URL -> FaviconImage(painterResource(R.drawable.ic_pocket))
+        SupportUtils.BAIDU_URL -> FaviconImage(painterResource(R.drawable.ic_baidu))
+        SupportUtils.JD_URL -> FaviconImage(painterResource(R.drawable.ic_jd))
+        SupportUtils.PDD_URL -> FaviconImage(painterResource(R.drawable.ic_pdd))
+        SupportUtils.TC_URL -> FaviconImage(painterResource(R.drawable.ic_tc))
+        SupportUtils.MEITUAN_URL -> FaviconImage(painterResource(R.drawable.ic_meituan))
+        else -> FaviconDefault(url)
     }
+}
 
 @Composable
 @Suppress("LongParameterList")
@@ -428,6 +459,7 @@ private fun getMenuItems(
     result.add(
         MenuItem(
             title = stringResource(id = R.string.bookmark_menu_open_in_private_tab_button),
+            testTag = TopSitesTestTag.openInPrivateTab,
             onClick = { onOpenInPrivateTabClicked(topSite) },
         ),
     )
@@ -436,6 +468,7 @@ private fun getMenuItems(
         result.add(
             MenuItem(
                 title = stringResource(id = R.string.rename_top_site),
+                testTag = TopSitesTestTag.rename,
                 onClick = { onRenameTopSiteClicked(topSite) },
             ),
         )
@@ -451,6 +484,7 @@ private fun getMenuItems(
                         R.string.delete_from_history
                     },
                 ),
+                testTag = TopSitesTestTag.remove,
                 onClick = { onRemoveTopSiteClicked(topSite) },
             ),
         )
@@ -460,6 +494,7 @@ private fun getMenuItems(
         result.add(
             MenuItem(
                 title = stringResource(id = R.string.delete_from_history),
+                testTag = TopSitesTestTag.remove,
                 onClick = { onRemoveTopSiteClicked(topSite) },
             ),
         )
@@ -559,6 +594,7 @@ private fun TopSitesPreview() {
                 onRemoveTopSiteClicked = {},
                 onSettingsClicked = {},
                 onSponsorPrivacyClicked = {},
+                onTopSitesItemBound = {},
             )
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesTestTag.kt b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesTestTag.kt
new file mode 100644
index 000000000..864cf71b2
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesTestTag.kt
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.home.topsites
+
+internal object TopSitesTestTag {
+    const val topSites = "top_sites_list"
+
+    const val topSiteItemRoot = "$topSites.top_site_item"
+    const val topSiteTitle = "$topSiteItemRoot.top_site_title"
+
+    // Contextual/DropDown menu
+    const val topSiteContextualMenu = "$topSites.top_site_contextual_menu"
+    const val openInPrivateTab = "$topSiteContextualMenu.open_in_private_tab"
+    const val rename = "$topSiteContextualMenu.rename"
+    const val remove = "$topSiteContextualMenu.remove"
+}
diff --git a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesViewHolder.kt
index ee8322643..0e6eb91a1 100644
--- a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSitesViewHolder.kt
@@ -8,10 +8,12 @@ import android.view.View
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import androidx.lifecycle.LifecycleOwner
-import mozilla.components.lib.state.ext.observeAsState
+import mozilla.components.lib.state.ext.observeAsComposableState
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.components.components
 import org.mozilla.fenix.compose.ComposeViewHolder
 import org.mozilla.fenix.home.sessioncontrol.TopSiteInteractor
+import org.mozilla.fenix.perf.StartupTimeline
 import org.mozilla.fenix.wallpapers.WallpaperState
 
 /**
@@ -31,23 +33,29 @@ class TopSitesViewHolder(
     @Composable
     override fun Content() {
         val topSites =
-            components.appStore.observeAsState(emptyList()) { state -> state.topSites }.value
+            components.appStore.observeAsComposableState { state -> state.topSites }.value
         val wallpaperState = components.appStore
-            .observeAsState(WallpaperState.default) { state -> state.wallpaperState }.value
+            .observeAsComposableState { state -> state.wallpaperState }.value
+            ?: WallpaperState.default
 
-        TopSites(
-            topSites = topSites,
-            topSiteColors = TopSiteColors.colors(wallpaperState = wallpaperState),
-            onTopSiteClick = { topSite ->
-                interactor.onSelectTopSite(topSite, topSites.indexOf(topSite))
-            },
-            onTopSiteLongClick = interactor::onTopSiteLongClicked,
-            onOpenInPrivateTabClicked = interactor::onOpenInPrivateTabClicked,
-            onRenameTopSiteClicked = interactor::onRenameTopSiteClicked,
-            onRemoveTopSiteClicked = interactor::onRemoveTopSiteClicked,
-            onSettingsClicked = interactor::onSettingsClicked,
-            onSponsorPrivacyClicked = interactor::onSponsorPrivacyClicked,
-        )
+        topSites?.let {
+            TopSites(
+                topSites = it,
+                topSiteColors = TopSiteColors.colors(wallpaperState = wallpaperState),
+                onTopSiteClick = { topSite ->
+                    interactor.onSelectTopSite(topSite, it.indexOf(topSite))
+                },
+                onTopSiteLongClick = interactor::onTopSiteLongClicked,
+                onOpenInPrivateTabClicked = interactor::onOpenInPrivateTabClicked,
+                onRenameTopSiteClicked = interactor::onRenameTopSiteClicked,
+                onRemoveTopSiteClicked = interactor::onRemoveTopSiteClicked,
+                onSettingsClicked = interactor::onSettingsClicked,
+                onSponsorPrivacyClicked = interactor::onSponsorPrivacyClicked,
+                onTopSitesItemBound = {
+                    StartupTimeline.onTopSitesItemBound(activity = composeView.context as HomeActivity)
+                },
+            )
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
index a2d2f5435..3ea3e0f37 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.navigation.NavController
+import androidx.recyclerview.widget.RecyclerView
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.support.base.feature.UserInteractionHandler
@@ -137,6 +138,8 @@ class BookmarkView(
     private val bookmarkAdapter = BookmarkAdapter(binding.bookmarksEmptyView, interactor)
 
     init {
+        bookmarkAdapter.stateRestorationPolicy = RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY
+
         binding.bookmarkList.apply {
             adapter = bookmarkAdapter
         }
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index 6ca7ed709..e037c9e88 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -63,6 +63,7 @@ import org.mozilla.fenix.library.history.state.HistoryNavigationMiddleware
 import org.mozilla.fenix.library.history.state.HistoryStorageMiddleware
 import org.mozilla.fenix.library.history.state.HistorySyncMiddleware
 import org.mozilla.fenix.library.history.state.HistoryTelemetryMiddleware
+import org.mozilla.fenix.library.history.state.bindings.MenuBinding
 import org.mozilla.fenix.library.history.state.bindings.PendingDeletionBinding
 import org.mozilla.fenix.tabstray.Page
 import org.mozilla.fenix.utils.allowUndo
@@ -95,6 +96,13 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
         PendingDeletionBinding(requireContext().components.appStore, historyView)
     }
 
+    private val menuBinding by lazy {
+        MenuBinding(
+            store = historyStore,
+            invalidateOptionsMenu = { activity?.invalidateOptionsMenu() },
+        )
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -110,6 +118,7 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
                         HistoryNavigationMiddleware(
                             navController = findNavController(),
                             openToBrowser = ::openItem,
+                            onBackPressed = requireActivity().onBackPressedDispatcher::onBackPressed,
                         ),
                         HistoryTelemetryMiddleware(
                             isInPrivateMode = requireComponents.appStore.state.mode == Mode.Private,
@@ -263,10 +272,12 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
 
     private fun startStateBindings() {
         pendingDeletionBinding.start()
+        menuBinding.start()
     }
 
     private fun stopStateBindings() {
         pendingDeletionBinding.stop()
+        menuBinding.stop()
     }
 
     private fun updateDeleteMenuItemView(isEnabled: Boolean) {
@@ -414,8 +425,12 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
         }
     }
 
-    override fun onBackPressed(): Boolean {
-        return historyView.onBackPressed()
+    override fun onBackPressed() = if (FeatureFlags.historyFragmentLibStateRefactor) {
+        // The state needs to be updated accordingly if Edit mode is active
+        historyStore.dispatch(HistoryFragmentAction.BackPressed)
+        true
+    } else {
+        historyView.onBackPressed()
     }
 
     override fun onDestroyView() {
@@ -425,7 +440,7 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler,
         _binding = null
     }
 
-    private fun openItem(item: History.Regular) {
+    private fun openItem(item: History.Regular) = runIfFragmentIsAttached {
         GleanHistory.openedItem.record(
             GleanHistory.OpenedItemExtra(
                 isRemote = item.isRemote,
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragmentStore.kt
index 00d727fcd..6927a4f53 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragmentStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragmentStore.kt
@@ -149,6 +149,16 @@ sealed class HistoryFragmentAction : Action {
      */
     data class DeleteItems(val items: Set<History>) : HistoryFragmentAction()
 
+    /**
+     * The user has clicked to enter the Recently Closed fragment.
+     */
+    object EnterRecentlyClosed : HistoryFragmentAction()
+
+    /**
+     * A back press event has been dispatched.
+     */
+    object BackPressed : HistoryFragmentAction()
+
     /**
      * Updates the empty state of [org.mozilla.fenix.library.history.HistoryView].
      */
@@ -259,10 +269,18 @@ private fun historyStateReducer(
                 )
             }
         }
+        is HistoryFragmentAction.BackPressed -> {
+            if (state.mode is HistoryFragmentState.Mode.Editing) {
+                state.copy(mode = HistoryFragmentState.Mode.Normal)
+            } else {
+                state
+            }
+        }
         // For deletion actions: the item list is handled through storage.
         // Updates from storage are dispatched directly to the view.
         is HistoryFragmentAction.DeleteItems,
         is HistoryFragmentAction.DeleteTimeRange,
+        is HistoryFragmentAction.EnterRecentlyClosed,
         -> state
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
index d454027c8..1a958fd57 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
@@ -99,7 +99,7 @@ class HistoryView(
         val last = layoutManager.findLastVisibleItemPosition() + 1
         historyAdapter.notifyItemRangeChanged(first, last - first)
 
-        if (state.mode::class != oldMode::class) {
+        if (state.mode::class != oldMode::class && !FeatureFlags.historyFragmentLibStateRefactor) {
             interactor.onModeSwitched()
         }
 
@@ -135,7 +135,11 @@ class HistoryView(
 
         with(binding.recentlyClosedNavEmpty) {
             recentlyClosedNav.setOnClickListener {
-                interactor.onRecentlyClosedClicked()
+                if (FeatureFlags.historyFragmentLibStateRefactor) {
+                    store.dispatch(HistoryFragmentAction.EnterRecentlyClosed)
+                } else {
+                    interactor.onRecentlyClosedClicked()
+                }
             }
             val numRecentTabs = recentlyClosedNav.context.components.core.store.state.closedTabs.size
             recentlyClosedTabsDescription.text = String.format(
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddleware.kt b/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddleware.kt
index b492cd936..13fd0386a 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddleware.kt
@@ -27,6 +27,7 @@ import org.mozilla.fenix.library.history.HistoryFragmentState
 class HistoryNavigationMiddleware(
     private val navController: NavController,
     private val openToBrowser: (item: History.Regular) -> Unit,
+    private val onBackPressed: () -> Unit,
     private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main),
 ) : Middleware<HistoryFragmentState, HistoryFragmentAction> {
     override fun invoke(
@@ -40,6 +41,18 @@ class HistoryNavigationMiddleware(
         next(action)
         scope.launch {
             when (action) {
+                is HistoryFragmentAction.EnterRecentlyClosed -> {
+                    navController.navigate(
+                        HistoryFragmentDirections.actionGlobalRecentlyClosed(),
+                        NavOptions.Builder().setPopUpTo(R.id.recentlyClosedFragment, true).build(),
+                    )
+                }
+                is HistoryFragmentAction.BackPressed -> {
+                    // When editing, we override the back pressed event to update the mode.
+                    if (currentState.mode !is HistoryFragmentState.Mode.Editing) {
+                        onBackPressed()
+                    }
+                }
                 is HistoryFragmentAction.HistoryItemClicked -> {
                     if (currentState.mode.selectedItems.isEmpty()) {
                         when (val item = action.item) {
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddleware.kt b/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddleware.kt
index 8ac7b7905..3d4f4fe91 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddleware.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.library.history.state
 import mozilla.components.lib.state.Middleware
 import mozilla.components.lib.state.MiddlewareContext
 import mozilla.components.service.glean.private.NoExtras
+import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.library.history.History
 import org.mozilla.fenix.library.history.HistoryFragmentAction
 import org.mozilla.fenix.library.history.HistoryFragmentState
@@ -30,6 +31,9 @@ class HistoryTelemetryMiddleware(
         val currentState = context.state
         next(action)
         when (action) {
+            is HistoryFragmentAction.EnterRecentlyClosed -> {
+                Events.recentlyClosedTabsOpened.record(NoExtras())
+            }
             is HistoryFragmentAction.HistoryItemClicked -> {
                 if (currentState.mode.selectedItems.isEmpty()) {
                     when (val item = action.item) {
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/state/bindings/MenuBinding.kt b/app/src/main/java/org/mozilla/fenix/library/history/state/bindings/MenuBinding.kt
new file mode 100644
index 000000000..dd792a727
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/library/history/state/bindings/MenuBinding.kt
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.library.history.state.bindings
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import mozilla.components.lib.state.helpers.AbstractBinding
+import org.mozilla.fenix.library.history.HistoryFragmentState
+import org.mozilla.fenix.library.history.HistoryFragmentStore
+
+/**
+ * A binding to map state updates to menu updates.
+ */
+class MenuBinding(
+    store: HistoryFragmentStore,
+    val invalidateOptionsMenu: () -> Unit,
+) : AbstractBinding<HistoryFragmentState>(store) {
+    override suspend fun onState(flow: Flow<HistoryFragmentState>) {
+        flow.distinctUntilChangedBy { it.mode }
+            .collect { invalidateOptionsMenu() }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
index 3da3aeaf1..9842cd9c7 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
@@ -33,7 +33,11 @@ class HistoryListItemViewHolder(
 
     init {
         binding.recentlyClosedNavEmpty.recentlyClosedNav.setOnClickListener {
-            historyInteractor.onRecentlyClosedClicked()
+            if (FeatureFlags.historyFragmentLibStateRefactor) {
+                store.dispatch(HistoryFragmentAction.EnterRecentlyClosed)
+            } else {
+                historyInteractor.onRecentlyClosedClicked()
+            }
         }
 
         binding.historyLayout.overflowView.apply {
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/HomeCFRPresenter.kt b/app/src/main/java/org/mozilla/fenix/onboarding/HomeCFRPresenter.kt
index fb9cf671c..e4f54f870 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/HomeCFRPresenter.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/HomeCFRPresenter.kt
@@ -7,6 +7,11 @@ package org.mozilla.fenix.onboarding
 import android.content.Context
 import android.view.View
 import androidx.compose.material.Text
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat.getColor
 import androidx.recyclerview.widget.RecyclerView
@@ -55,6 +60,7 @@ class HomeCFRPresenter(
         }
     }
 
+    @OptIn(ExperimentalComposeUiApi::class)
     private fun showSyncedTabCFR(view: View) {
         CFRPopup(
             anchor = view,
@@ -69,7 +75,12 @@ class HomeCFRPresenter(
             ),
             onDismiss = {
                 when (it) {
-                    true -> Onboarding.syncCfrExplicitDismissal.record(NoExtras())
+                    true -> {
+                        Onboarding.syncCfrExplicitDismissal.record(NoExtras())
+                        // Turn off both the recent tab and synced tab CFR after the recent synced tab CFR is shown.
+                        context.settings().showSyncCFR = false
+                        context.settings().shouldShowJumpBackInCFR = false
+                    }
                     false -> Onboarding.syncCfrImplicitDismissal.record(NoExtras())
                 }
             },
@@ -79,18 +90,20 @@ class HomeCFRPresenter(
                         text = context.getString(R.string.sync_cfr_message),
                         color = FirefoxTheme.colors.textOnColorPrimary,
                         style = FirefoxTheme.typography.body2,
+                        modifier = Modifier
+                            .semantics {
+                                testTagsAsResourceId = true
+                                testTag = "sync_cfr.message"
+                            },
                     )
                 }
             },
         ).show()
 
-        // Turn off both the recent tab and synced tab CFR after the recent synced tab CFR is shown.
-        context.settings().showSyncCFR = false
-        context.settings().shouldShowJumpBackInCFR = false
-
         Onboarding.synCfrShown.record(NoExtras())
     }
 
+    @OptIn(ExperimentalComposeUiApi::class)
     @Suppress("MagicNumber")
     private fun showJumpBackInCFR(view: View) {
         CFRPopup(
@@ -106,7 +119,12 @@ class HomeCFRPresenter(
             ),
             onDismiss = {
                 when (it) {
-                    true -> RecentTabs.jumpBackInCfrDismissed.record(NoExtras())
+                    true -> {
+                        RecentTabs.jumpBackInCfrDismissed.record(NoExtras())
+                        // Users can still see the recent synced tab CFR after the recent tab CFR is shown in
+                        // subsequent navigation to the Home screen.
+                        context.settings().shouldShowJumpBackInCFR = false
+                    }
                     false -> RecentTabs.jumpBackInCfrCancelled.record(NoExtras())
                 }
             },
@@ -116,15 +134,16 @@ class HomeCFRPresenter(
                         text = context.getString(R.string.onboarding_home_screen_jump_back_contextual_hint_2),
                         color = FirefoxTheme.colors.textOnColorPrimary,
                         style = FirefoxTheme.typography.body2,
+                        modifier = Modifier
+                            .semantics {
+                                testTagsAsResourceId = true
+                                testTag = "jump_back_cfr.message"
+                            },
                     )
                 }
             },
         ).show()
 
-        // Users can still see the recent synced tab CFR after the recent tab CFR is shown in
-        // subsequent navigation to the Home screen.
-        context.settings().shouldShowJumpBackInCFR = false
-
         RecentTabs.jumpBackInCfrShown.record(NoExtras())
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
index f5e5f2376..17448560f 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
@@ -76,7 +76,7 @@ fun JunoOnboardingScreen(
     onImpression: (pageType: OnboardingPageUiData) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val pagerState = rememberPagerState()
+    val pagerState = rememberPagerState(pageCount = { pagesToDisplay.size })
     val isSignedIn: State<Boolean?> = components.backgroundServices.syncStore
         .observeAsComposableState { it.account != null }
     val widgetPinnedFlow: StateFlow<Boolean> = WidgetPinnedState.isPinned
@@ -184,7 +184,6 @@ private fun JunoOnboardingContent(
             .navigationBarsPadding(),
     ) {
         HorizontalPager(
-            pageCount = pagesToDisplay.size,
             state = pagerState,
             key = { pagesToDisplay[it].type },
             modifier = Modifier
@@ -209,7 +208,6 @@ private fun JunoOnboardingContent(
 
         PagerIndicator(
             pagerState = pagerState,
-            pageCount = pagesToDisplay.size,
             activeColor = FirefoxTheme.colors.actionPrimary,
             inactiveColor = FirefoxTheme.colors.actionSecondary,
             leaveTrail = true,
@@ -244,10 +242,13 @@ private class DisableForwardSwipeNestedScrollConnection(
 @LightDarkPreview
 @Composable
 private fun JunoOnboardingScreenPreview() {
+    val pageCount = defaultPreviewPages().size
     FirefoxTheme {
         JunoOnboardingContent(
             pagesToDisplay = defaultPreviewPages(),
-            pagerState = PagerState(0),
+            pagerState = rememberPagerState(initialPage = 0) {
+                pageCount
+            },
             onMakeFirefoxDefaultClick = {},
             onMakeFirefoxDefaultSkipClick = {},
             onPrivacyPolicyClick = {},
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt
index 800272b08..66d31d05c 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt
@@ -61,6 +61,24 @@ class StartupReportFullyDrawn {
         }
     }
 
+    /**
+     * Instruments "visually complete" cold startup time to homescreen for use with FNPRMS.
+     *
+     * For FNPRMS, we define "visually complete" to be when top sites is loaded with placeholders;
+     * the animation to display top sites will occur after this point, as will the asynchronous
+     * loading of the actual top sites icons. Our focus for visually complete is usability.
+     * There are no tabs available in our FNPRMS tests so they are ignored for this instrumentation.
+     */
+    fun onTopSitesItemBound(state: StartupState, activity: HomeActivity) {
+        if (!isInstrumented &&
+            state is StartupState.Cold && state.destination == HOMESCREEN
+        ) {
+            isInstrumented = true
+
+            attachReportFullyDrawn(activity)
+        }
+    }
+
     private fun attachReportFullyDrawn(activity: Activity, view: View) {
         // For greater accuracy, we could add an onDrawListener instead of a preDrawListener but:
         // - single use onDrawListeners are not built-in and it's non-trivial to write one
@@ -69,4 +87,8 @@ class StartupReportFullyDrawn {
         // should be comparable
         view.doOnPreDraw { activity.reportFullyDrawnSafe(Performance.logger) }
     }
+
+    private fun attachReportFullyDrawn(activity: Activity) {
+        activity.reportFullyDrawnSafe(Performance.logger)
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupTimeline.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupTimeline.kt
index 0c3cd8bb2..e87e17af8 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StartupTimeline.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StartupTimeline.kt
@@ -54,6 +54,13 @@ object StartupTimeline {
         reportFullyDrawn.onTopSitesItemBound(state, holder)
     }
 
+    /**
+     * Instruments "visually complete" cold startup time to homescreen for use with FNPRMS.
+     */
+    fun onTopSitesItemBound(activity: HomeActivity) {
+        reportFullyDrawn.onTopSitesItemBound(state, activity)
+    }
+
     private fun advanceState(startingActivity: StartupActivity) {
         state = StartupTimelineStateMachine.getNextState(state, startingActivity)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
index 14ae3371e..9f1ed50ab 100644
--- a/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/perf/StrictModeManager.kt
@@ -176,7 +176,8 @@ open class StrictModeManager(
  * To add a new manufacturer to the list, log "Build.MANUFACTURER" from the device to get the
  * exact name of the manufacturer.
  */
-private fun isInStrictModeExceptionList() = ManufacturerCodes.isHuawei || ManufacturerCodes.isOnePlus
+private fun isInStrictModeExceptionList() =
+    ManufacturerCodes.isHuawei || ManufacturerCodes.isOnePlus || ManufacturerCodes.isOppo
 
 private fun StrictMode.ThreadPolicy.Builder.penaltyDeathWithIgnores(): StrictMode.ThreadPolicy.Builder {
     // This workaround was added before we realized we can ignored based on violation contents
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
index e783d4485..c0443a551 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
@@ -163,15 +163,23 @@ class SearchDialogController(
                     settings.shouldShowSearchShortcuts,
             ),
         )
-        fragmentStore.dispatch(
-            SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt(
-                text.isNotEmpty() &&
-                    activity.browsingModeManager.mode.isPrivate &&
-                    settings.shouldShowSearchSuggestions &&
-                    !settings.shouldShowSearchSuggestionsInPrivate &&
-                    !settings.showSearchSuggestionsInPrivateOnboardingFinished,
-            ),
-        )
+
+        // For felt private browsing mode we're no longer going to prompt the user to enable search
+        // suggestions while using private browsing mode. The preference to enable them will still
+        // remain in settings.
+        val isFeltPrivacyEnabled = settings.feltPrivateBrowsingEnabled
+
+        if (!isFeltPrivacyEnabled) {
+            fragmentStore.dispatch(
+                SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt(
+                    text.isNotEmpty() &&
+                        activity.browsingModeManager.mode.isPrivate &&
+                        settings.shouldShowSearchSuggestions &&
+                        !settings.shouldShowSearchSuggestionsInPrivate &&
+                        !settings.showSearchSuggestionsInPrivateOnboardingFinished,
+                ),
+            )
+        }
     }
 
     override fun handleUrlTapped(url: String, flags: LoadUrlFlags) {
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 197098e9c..4455fe02c 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -25,6 +25,7 @@ import mozilla.components.feature.awesomebar.provider.SearchEngineSuggestionProv
 import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SearchTermSuggestionsProvider
 import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider
+import mozilla.components.feature.fxsuggest.FxSuggestSuggestionProvider
 import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.syncedtabs.DeviceIndicators
@@ -56,6 +57,7 @@ class AwesomeBarView(
     private val engineForSpeculativeConnects: Engine?
     private val defaultHistoryStorageProvider: HistoryStorageSuggestionProvider
     private val defaultCombinedHistoryProvider: CombinedHistorySuggestionProvider
+    private val fxSuggestProvider: FxSuggestSuggestionProvider?
     private val shortcutsEnginePickerProvider: ShortcutsSuggestionProvider
     private val defaultSearchSuggestionProvider: SearchSuggestionProvider
     private val defaultSearchActionProvider: SearchActionProvider
@@ -138,6 +140,18 @@ class AwesomeBarView(
                 suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
             )
 
+        fxSuggestProvider = if (activity.settings().enableFxSuggest) {
+            FxSuggestSuggestionProvider(
+                resources = activity.resources,
+                loadUrlUseCase = loadUrlUseCase,
+                includeSponsoredSuggestions = activity.settings().showSponsoredSuggestions,
+                includeNonSponsoredSuggestions = activity.settings().showNonSponsoredSuggestions,
+                suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
+            )
+        } else {
+            null
+        }
+
         val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
             colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
         }.toBitmap()
@@ -320,6 +334,8 @@ class AwesomeBarView(
 
         providersToAdd.add(searchEngineSuggestionProvider)
 
+        fxSuggestProvider?.let { providersToAdd.add(it) }
+
         return providersToAdd
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
index d28e23939..73e86adc3 100644
--- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
@@ -210,6 +210,10 @@ class ToolbarView(
                             true -> components.core.historyStorage
                             false -> null
                         },
+                        when (settings.shouldShowBookmarkSuggestions) {
+                            true -> components.core.bookmarksStorage
+                            false -> null
+                        },
                         components.core.domainsAutocompleteProvider,
                     ),
                 )
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index 158201ce3..e029e2ebf 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -27,7 +27,7 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
         super.onCreate(savedInstanceState)
 
         val context = requireContext()
-        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this) { _, key ->
+        preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this) { _, key ->
             if (key == getPreferenceKey(R.string.pref_key_telemetry)) {
                 if (context.settings().isTelemetryEnabled) {
                     context.components.analytics.metrics.start(MetricServiceType.Data)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/LearnMoreSwitchPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/LearnMoreSwitchPreference.kt
index 40316aa10..6bdb510bd 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/LearnMoreSwitchPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/LearnMoreSwitchPreference.kt
@@ -34,7 +34,7 @@ abstract class LearnMoreSwitchPreference(context: Context, attrs: AttributeSet?)
         switch.run {
             isChecked = getSwitchValue()
             setOnCheckedChangeListener { _, isChecked ->
-                onPreferenceChangeListener.onPreferenceChange(
+                onPreferenceChangeListener?.onPreferenceChange(
                     this@LearnMoreSwitchPreference,
                     isChecked,
                 )
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
index 56b9ce54b..17f625be0 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings
 
 import android.os.Bundle
+import androidx.core.content.edit
 import androidx.navigation.fragment.findNavController
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
@@ -12,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
@@ -46,12 +48,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
 
-        requirePreference<SwitchPreference>(R.string.pref_key_enable_task_continuity).apply {
-            isVisible = true
-            isChecked = context.settings().enableTaskContinuityEnhancements
-            onPreferenceChangeListener = SharedPreferenceUpdater()
-        }
-
         requirePreference<SwitchPreference>(R.string.pref_key_enable_tabs_tray_to_compose).apply {
             isVisible = true
             isChecked = context.settings().enableTabsTrayToCompose
@@ -70,6 +66,32 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
 
+        requirePreference<SwitchPreference>(R.string.pref_key_enable_translations).apply {
+            isVisible = FeatureFlags.translations
+            isChecked = context.settings().enableTranslations
+            onPreferenceChangeListener = SharedPreferenceUpdater()
+        }
+
+        requirePreference<SwitchPreference>(R.string.pref_key_enable_fxsuggest).apply {
+            isVisible = FeatureFlags.fxSuggest
+            isChecked = context.settings().enableFxSuggest
+            onPreferenceChangeListener = object : Preference.OnPreferenceChangeListener {
+                override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
+                    val newBooleanValue = newValue as? Boolean ?: return false
+                    val ingestionScheduler = requireContext().components.fxSuggest.ingestionScheduler
+                    if (newBooleanValue) {
+                        ingestionScheduler.startPeriodicIngestion()
+                    } else {
+                        ingestionScheduler.stopPeriodicIngestion()
+                    }
+                    requireContext().settings().preferences.edit {
+                        putBoolean(preference.key, newBooleanValue)
+                    }
+                    return true
+                }
+            }
+        }
+
         // for performance reasons, this is only available in Nightly or Debug builds
         requirePreference<EditTextPreference>(R.string.pref_key_custom_glean_server_url).apply {
             isVisible = Config.channel.isNightlyOrDebug && BuildConfig.GLEAN_CUSTOM_URL.isNullOrEmpty()
@@ -80,8 +102,8 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        when (preference?.key) {
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        when (preference.key) {
             getString(R.string.pref_key_custom_sponsored_stories_parameters) ->
                 findNavController().nav(
                     R.id.secretSettingsPreference,
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 3b33e295a..0952ae4ac 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -135,8 +135,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
             requireContext().getString(R.string.pref_key_show_search_suggestions_in_private),
         )
 
-        preferenceManager.sharedPreferences
-            .registerOnSharedPreferenceChangeListener(this) { sharedPreferences, key ->
+        preferenceManager?.sharedPreferences
+            ?.registerOnSharedPreferenceChangeListener(this) { sharedPreferences, key ->
                 try {
                     if (key in booleanPreferenceTelemetryAllowList) {
                         val enabled = sharedPreferences.getBoolean(key, false)
@@ -178,9 +178,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
         requireView().findViewById<RecyclerView>(R.id.recycler_view)
             ?.hideInitialScrollBar(viewLifecycleOwner.lifecycleScope)
 
-        if (args.preferenceToScrollTo != null) {
-            scrollToPreference(args.preferenceToScrollTo)
+        args.preferenceToScrollTo?.let {
+            scrollToPreference(it)
         }
+
         // Consider finish of `onResume` to be the point at which we consider this fragment as 'created'.
         creatingFragment = false
     }
@@ -636,16 +637,17 @@ class SettingsFragment : PreferenceFragmentCompat() {
     @VisibleForTesting
     internal fun setupHomepagePreference() {
         with(requirePreference<Preference>(R.string.pref_key_home)) {
-            summary = context?.let {
-                when {
-                    it.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
-                        getString(R.string.opening_screen_homepage_summary)
-                    it.settings().openHomepageAfterFourHoursOfInactivity ->
-                        getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
-                    it.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
-                        getString(R.string.opening_screen_last_tab_summary)
-                    else -> null
-                }
+            summary = when {
+                context.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
+                    getString(R.string.opening_screen_homepage_summary)
+
+                context.settings().openHomepageAfterFourHoursOfInactivity ->
+                    getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
+
+                context.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
+                    getString(R.string.opening_screen_last_tab_summary)
+
+                else -> null
             }
         }
     }
@@ -661,14 +663,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
     @VisibleForTesting
     internal fun setupTrackingProtectionPreference() {
         with(requirePreference<Preference>(R.string.pref_key_tracking_protection_settings)) {
-            summary = context?.let {
-                when {
-                    !it.settings().shouldUseTrackingProtection -> getString(R.string.tracking_protection_off)
-                    it.settings().useStandardTrackingProtection -> getString(R.string.tracking_protection_standard)
-                    it.settings().useStrictTrackingProtection -> getString(R.string.tracking_protection_strict)
-                    it.settings().useCustomTrackingProtection -> getString(R.string.tracking_protection_custom)
-                    else -> null
-                }
+            summary = when {
+                !context.settings().shouldUseTrackingProtection -> getString(R.string.tracking_protection_off)
+                context.settings().useStandardTrackingProtection -> getString(R.string.tracking_protection_standard)
+                context.settings().useStrictTrackingProtection -> getString(R.string.tracking_protection_strict)
+                context.settings().useCustomTrackingProtection -> getString(R.string.tracking_protection_custom)
+                else -> null
             }
         }
     }
@@ -676,14 +676,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
     @VisibleForTesting
     internal fun setupCookieBannerPreference() {
         with(requirePreference<Preference>(R.string.pref_key_cookie_banner_settings)) {
-            summary = context?.let {
-                isVisible = it.settings().shouldShowCookieBannerUI
+            isVisible = context.settings().shouldShowCookieBannerUI
 
-                if (it.settings().shouldUseCookieBanner) {
-                    getString(R.string.reduce_cookie_banner_option_on)
-                } else {
-                    getString(R.string.reduce_cookie_banner_option_off)
-                }
+            summary = if (context.settings().shouldUseCookieBanner) {
+                getString(R.string.reduce_cookie_banner_option_on)
+            } else {
+                getString(R.string.reduce_cookie_banner_option_off)
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
index f34322c5a..583b10e5d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
@@ -303,8 +303,8 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor(
         value = getPersistedInt((defaultValue as Int?)!!)
     }
 
-    override fun onGetDefaultValue(a: TypedArray?, index: Int): Any {
-        return a!!.getInt(index, 0)
+    override fun onGetDefaultValue(a: TypedArray, index: Int): Any {
+        return a.getInt(index, 0)
     }
 
     private fun setValueInternal(value: Int, notifyChanged: Boolean) {
@@ -407,7 +407,7 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor(
         }
     }
 
-    override fun onSaveInstanceState(): Parcelable {
+    override fun onSaveInstanceState(): Parcelable? {
         val superState = super.onSaveInstanceState()
         if (isPersistent) {
             // No need to save instance state since it's persistent
@@ -415,11 +415,16 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor(
         }
 
         // Save the instance state
-        val myState = SavedState(superState)
-        myState.mSeekBarValue = mSeekBarValue
-        myState.mMin = mMin
-        myState.mMax = mMax
-        return myState
+
+        return if (superState != null) {
+            val myState = SavedState(superState)
+            myState.mSeekBarValue = mSeekBarValue
+            myState.mMin = mMin
+            myState.mMax = mMax
+            myState
+        } else {
+            null
+        }
     }
 
     override fun onRestoreInstanceState(state: Parcelable?) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
index 05d174884..8b402188d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
@@ -74,7 +74,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
                 // Remove the device name when we log out.
                 context?.let {
                     val deviceNameKey = it.getPreferenceKey(R.string.pref_key_sync_device_name)
-                    preferenceManager.sharedPreferences.edit().remove(deviceNameKey).apply()
+                    preferenceManager.sharedPreferences?.edit()?.remove(deviceNameKey)?.apply()
                 }
             }
         }
@@ -142,8 +142,10 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         preferenceSyncNow.apply {
             onPreferenceClickListener = getClickListenerForSyncNow()
 
-            icon = icon.mutate().apply {
-                setTint(context.getColorFromAttr(R.attr.textPrimary))
+            icon?.let {
+                icon = it.mutate().apply {
+                    setTint(context.getColorFromAttr(R.attr.textPrimary))
+                }
             }
 
             // Current sync state
diff --git a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
index 382f33162..fc201ee5d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
@@ -123,7 +123,7 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
+    ): View {
         loadAutofillState()
         return super.onCreateView(inflater, container, savedInstanceState)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
index b2d5c8c75..86dfd06f8 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
@@ -157,23 +157,25 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
     }
 
     private fun deleteSelected() {
-        startDeletion()
-        lifecycleScope.launch(IO) {
-            getCheckboxes().mapIndexed { i, v ->
-                if (v.isChecked) {
-                    when (i) {
-                        OPEN_TABS_INDEX -> controller.deleteTabs()
-                        HISTORY_INDEX -> controller.deleteBrowsingHistory()
-                        COOKIES_INDEX -> controller.deleteCookiesAndSiteData()
-                        CACHED_INDEX -> controller.deleteCachedFiles()
-                        PERMS_INDEX -> controller.deleteSitePermissions()
-                        DOWNLOADS_INDEX -> controller.deleteDownloads()
+        runIfFragmentIsAttached {
+            startDeletion()
+            lifecycleScope.launch(IO) {
+                getCheckboxes().mapIndexed { i, v ->
+                    if (v.isChecked) {
+                        when (i) {
+                            OPEN_TABS_INDEX -> controller.deleteTabs()
+                            HISTORY_INDEX -> controller.deleteBrowsingHistory()
+                            COOKIES_INDEX -> controller.deleteCookiesAndSiteData()
+                            CACHED_INDEX -> controller.deleteCachedFiles()
+                            PERMS_INDEX -> controller.deleteSitePermissions()
+                            DOWNLOADS_INDEX -> controller.deleteDownloads()
+                        }
                     }
                 }
-            }
 
-            withContext(Main) {
-                finishDeletion()
+                withContext(Main) {
+                    finishDeletion()
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
index 2f6b3b243..3f5c19f39 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
@@ -117,7 +117,12 @@ class QuickSettingsSheetDialogFragment : FenixDialogFragment() {
         websitePermissionsView =
             WebsitePermissionsView(binding.websitePermissionsLayout, interactor)
         protectionsView =
-            ProtectionsView(binding.trackingProtectionLayout, interactor, context.settings())
+            ProtectionsView(
+                binding.trackingProtectionLayout,
+                binding.trackingProtectionDivider,
+                interactor,
+                context.settings(),
+            )
         clearSiteDataView = ClearSiteDataView(
             context = context,
             ioScope = viewLifecycleOwner.lifecycleScope + Dispatchers.IO,
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
index 741ed46c3..9ef156d2b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings.quicksettings.protections
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
 import androidx.compose.foundation.background
@@ -40,12 +41,15 @@ import org.mozilla.fenix.utils.Settings
  * to additional tracking protection details.
  *
  * @param containerView [ViewGroup] in which this View will inflate itself.
+ * @param trackingProtectionDivider trackingProtectionDivider The divider line between tracking protection layout
+ * and other views from [QuickSettingsSheetDialogFragment].
  * @param interactor [ProtectionsInteractor] which will have delegated to all user
  * @param settings [Settings] application settings.
  * interactions.
  */
 class ProtectionsView(
     val containerView: ViewGroup,
+    private val trackingProtectionDivider: View,
     val interactor: ProtectionsInteractor,
     val settings: Settings,
 ) {
@@ -63,11 +67,21 @@ class ProtectionsView(
         binding.trackingProtectionDetails.setOnClickListener {
             interactor.onTrackingProtectionDetailsClicked()
         }
+        updateDividerVisibility()
+    }
+
+    private fun updateDividerVisibility() {
+        trackingProtectionDivider.isVisible = !(
+            !binding.trackingProtectionSwitch.isVisible &&
+                !binding.trackingProtectionDetails.isVisible &&
+                !binding.cookieBannerItem.isVisible
+            )
     }
 
     @VisibleForTesting
     internal fun updateDetailsSection(show: Boolean) {
         binding.trackingProtectionDetails.isVisible = show
+        updateDividerVisibility()
     }
 
     private fun bindTrackingProtectionInfo(isTrackingProtectionEnabled: Boolean) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt
index 96f212f79..553c170e0 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt
@@ -70,7 +70,7 @@ fun CookieBannerReEngagementDialogCompose(
     onNotNowButtonClicked: () -> Unit,
 ) {
     Dialog(
-        properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = false),
+        properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
         onDismissRequest = onNotNowButtonClicked,
     ) {
         Surface(
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
index 683f77d3e..acbdbffa2 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
@@ -38,10 +38,17 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
         requirePreference<SwitchPreference>(R.string.pref_key_show_search_engine_shortcuts).apply {
             isVisible = !context.settings().showUnifiedSearchFeature
         }
+        requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply {
+            isVisible = context.settings().enableFxSuggest
+        }
+        requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply {
+            isVisible = context.settings().enableFxSuggest
+        }
 
         view?.hideKeyboard()
     }
 
+    @Suppress("LongMethod")
     override fun onResume() {
         super.onResume()
         view?.hideKeyboard()
@@ -99,6 +106,24 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
                 isChecked = context.settings().shouldShowVoiceSearch
             }
 
+        val showSponsoredSuggestionsPreference =
+            requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply {
+                isChecked = context.settings().showSponsoredSuggestions
+                summary = getString(
+                    R.string.preferences_show_sponsored_suggestions_summary,
+                    getString(R.string.app_name),
+                )
+            }
+
+        val showNonSponsoredSuggestionsPreference =
+            requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply {
+                isChecked = context.settings().showNonSponsoredSuggestions
+                title = getString(
+                    R.string.preferences_show_nonsponsored_suggestions,
+                    getString(R.string.app_name),
+                )
+            }
+
         searchSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
         showSearchShortcuts.onPreferenceChangeListener = SharedPreferenceUpdater()
         showHistorySuggestions.onPreferenceChangeListener = SharedPreferenceUpdater()
@@ -125,6 +150,9 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
             }
             true
         }
+
+        showSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
+        showNonSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
     }
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ReviewQualityCheckFragment.kt b/app/src/main/java/org/mozilla/fenix/shopping/ReviewQualityCheckFragment.kt
index ac7d47293..be6f2cad0 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ReviewQualityCheckFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ReviewQualityCheckFragment.kt
@@ -16,6 +16,8 @@ import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.mozilla.fenix.BrowserDirection
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.shopping.di.ReviewQualityCheckMiddlewareProvider
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckStore
@@ -33,6 +35,14 @@ class ReviewQualityCheckFragment : BottomSheetDialogFragment() {
             middleware = ReviewQualityCheckMiddlewareProvider.provideMiddleware(
                 settings = requireComponents.settings,
                 browserStore = requireComponents.core.store,
+                context = requireContext().applicationContext,
+                openLink = { link, shouldOpenInNewTab ->
+                    (requireActivity() as HomeActivity).openToBrowserAndLoad(
+                        searchTermOrURL = link,
+                        newTab = shouldOpenInNewTab,
+                        from = BrowserDirection.FromReviewQualityCheck,
+                    )
+                },
                 scope = lifecycleScope,
             ),
         )
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/di/ReviewQualityCheckMiddlewareProvider.kt b/app/src/main/java/org/mozilla/fenix/shopping/di/ReviewQualityCheckMiddlewareProvider.kt
index 1d0c46f7a..a221c7c3a 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/di/ReviewQualityCheckMiddlewareProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/di/ReviewQualityCheckMiddlewareProvider.kt
@@ -4,12 +4,15 @@
 
 package org.mozilla.fenix.shopping.di
 
+import android.content.Context
 import kotlinx.coroutines.CoroutineScope
 import mozilla.components.browser.state.store.BrowserStore
+import org.mozilla.fenix.shopping.middleware.DefaultNetworkChecker
+import org.mozilla.fenix.shopping.middleware.DefaultReviewQualityCheckPreferences
+import org.mozilla.fenix.shopping.middleware.DefaultReviewQualityCheckService
+import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckNavigationMiddleware
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckNetworkMiddleware
-import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckPreferencesImpl
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckPreferencesMiddleware
-import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckServiceImpl
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckMiddleware
 import org.mozilla.fenix.utils.Settings
 
@@ -23,31 +26,47 @@ object ReviewQualityCheckMiddlewareProvider {
      *
      * @param settings The [Settings] instance to use.
      * @param browserStore The [BrowserStore] instance to access state.
+     * @param context The [Context] instance to use.
+     * @param openLink Opens a link. The callback is invoked with the URL [String] parameter and
+     * whether or not it should open in a new or the currently selected tab [Boolean] parameter.
      * @param scope The [CoroutineScope] to use for launching coroutines.
      */
     fun provideMiddleware(
         settings: Settings,
         browserStore: BrowserStore,
+        context: Context,
+        openLink: (String, Boolean) -> Unit,
         scope: CoroutineScope,
     ): List<ReviewQualityCheckMiddleware> =
         listOf(
             providePreferencesMiddleware(settings, scope),
-            provideNetworkMiddleware(browserStore, scope),
+            provideNetworkMiddleware(browserStore, context, scope),
+            provideNavigationMiddleware(openLink, scope),
         )
 
     private fun providePreferencesMiddleware(
         settings: Settings,
         scope: CoroutineScope,
     ) = ReviewQualityCheckPreferencesMiddleware(
-        reviewQualityCheckPreferences = ReviewQualityCheckPreferencesImpl(settings),
+        reviewQualityCheckPreferences = DefaultReviewQualityCheckPreferences(settings),
         scope = scope,
     )
 
     private fun provideNetworkMiddleware(
         browserStore: BrowserStore,
+        context: Context,
         scope: CoroutineScope,
     ) = ReviewQualityCheckNetworkMiddleware(
-        reviewQualityCheckService = ReviewQualityCheckServiceImpl(browserStore),
+        reviewQualityCheckService = DefaultReviewQualityCheckService(browserStore),
+        networkChecker = DefaultNetworkChecker(context),
+        scope = scope,
+    )
+
+    private fun provideNavigationMiddleware(
+        openLink: (String, Boolean) -> Unit,
+        scope: CoroutineScope,
+    ) = ReviewQualityCheckNavigationMiddleware(
+        openLink = openLink,
         scope = scope,
     )
 }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/NetworkChecker.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/NetworkChecker.kt
new file mode 100644
index 000000000..5a61d68ba
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/NetworkChecker.kt
@@ -0,0 +1,33 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.middleware
+
+import android.content.Context
+import android.net.ConnectivityManager
+import androidx.core.content.getSystemService
+import org.mozilla.fenix.ext.isOnline
+
+/**
+ * Checks if the device is connected to the internet.
+ */
+interface NetworkChecker {
+
+    /**
+     * @return true if the device is connected to the internet, false otherwise.
+     */
+    fun isConnected(): Boolean
+}
+
+/**
+ * @see [NetworkChecker].
+ */
+class DefaultNetworkChecker(private val context: Context) : NetworkChecker {
+
+    private val connectivityManager by lazy { context.getSystemService<ConnectivityManager>() }
+
+    override fun isConnected(): Boolean {
+        return connectivityManager?.isOnline() ?: false
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
index c7dc5c026..92be6426b 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
@@ -10,35 +10,40 @@ import mozilla.components.concept.engine.shopping.ProductAnalysis
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.HighlightType
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 /**
  * Maps [ProductAnalysis] to [ProductReviewState].
  */
 fun ProductAnalysis?.toProductReviewState(): ProductReviewState =
     if (this == null) {
-        ProductReviewState.Error
+        ProductReviewState.Error.GenericError
     } else {
         when (this) {
             is GeckoProductAnalysis -> toProductReview()
-            else -> ProductReviewState.Error
+            else -> ProductReviewState.Error.GenericError
         }
     }
 
 private fun GeckoProductAnalysis.toProductReview(): ProductReviewState =
     if (productId == null) {
-        ProductReviewState.Error
+        if (needsAnalysis) {
+            ProductReviewState.NoAnalysisPresent()
+        } else {
+            ProductReviewState.Error.GenericError
+        }
     } else {
         val mappedRating = adjustedRating.toFloatOrNull()
         val mappedGrade = grade?.toGrade()
         val mappedHighlights = highlights?.toHighlights()?.toSortedMap()
 
         if (mappedGrade == null && mappedRating == null && mappedHighlights == null) {
-            ProductReviewState.NoAnalysisPresent
+            ProductReviewState.NoAnalysisPresent()
         } else {
             ProductReviewState.AnalysisPresent(
                 productId = productId!!,
                 reviewGrade = mappedGrade,
-                needsAnalysis = needsAnalysis,
+                analysisStatus = needsAnalysis.toAnalysisStatus(),
                 adjustedRating = mappedRating,
                 productUrl = analysisURL!!,
                 highlights = mappedHighlights,
@@ -53,6 +58,12 @@ private fun String.toGrade(): ReviewQualityCheckState.Grade? =
         null
     }
 
+private fun Boolean.toAnalysisStatus(): AnalysisStatus =
+    when (this) {
+        true -> AnalysisStatus.NEEDS_ANALYSIS
+        false -> AnalysisStatus.UP_TO_DATE
+    }
+
 private fun Highlight.toHighlights(): Map<HighlightType, List<String>>? =
     HighlightType.values()
         .associateWith { highlightsForType(it) }
@@ -67,7 +78,7 @@ private fun Highlight.highlightsForType(highlightType: HighlightType) =
         HighlightType.SHIPPING -> shipping
         HighlightType.PACKAGING_AND_APPEARANCE -> appearance
         HighlightType.COMPETITIVENESS -> competitiveness
-    }
+    }?.map { it.surroundWithQuotes() }
 
 /**
  * GeckoView sets 0.0 as default instead of null for adjusted rating. This maps 0.0 to null making
@@ -80,3 +91,6 @@ private fun Double.toFloatOrNull(): Float? =
     } else {
         toFloat()
     }
+
+private fun String.surroundWithQuotes(): String =
+    "\"$this\""
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/Retry.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/Retry.kt
new file mode 100644
index 000000000..90e59eeb0
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/Retry.kt
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.middleware
+
+import kotlinx.coroutines.delay
+
+private const val MAX_RETRIES = 10
+private const val INITIAL_DELAY_MS = 2000L
+private const val MAX_DELAY_MS = 20000L
+private const val FACTOR = 2.0
+
+/**
+ * Retry a suspend function until it returns a value that satisfies the predicate.
+ *
+ * @param maxRetries The maximum number of retries.
+ * @param initialDelayMs The initial delay in milliseconds.
+ * @param maxDelayMs The maximum delay in milliseconds.
+ * @param factor The factor to increase the delay by.
+ * @param predicate The predicate to check the result against.
+ * @param block The function to retry.
+ */
+suspend fun <T> retry(
+    maxRetries: Int = MAX_RETRIES,
+    initialDelayMs: Long = INITIAL_DELAY_MS,
+    maxDelayMs: Long = MAX_DELAY_MS,
+    factor: Double = FACTOR,
+    predicate: (T) -> Boolean,
+    block: suspend () -> T,
+): T {
+    var delayTime = initialDelayMs
+    var data: T = block()
+
+    repeat(maxRetries - 1) {
+        if (predicate(data)) {
+            delay(delayTime)
+            data = block()
+            delayTime = (delayTime * factor).toLong().coerceAtMost(maxDelayMs)
+        } else {
+            return data
+        }
+    }
+    return data
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
new file mode 100644
index 000000000..f67097bea
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddleware.kt
@@ -0,0 +1,51 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.middleware
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import mozilla.components.lib.state.Middleware
+import mozilla.components.lib.state.MiddlewareContext
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckAction
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
+
+/**
+ * Middleware that handles navigation events for the review quality check feature.
+ *
+ * @property openLink Callback used to open an url.
+ * @property scope [CoroutineScope] used to launch coroutines.
+ */
+class ReviewQualityCheckNavigationMiddleware(
+    private val openLink: (String, Boolean) -> Unit,
+    private val scope: CoroutineScope,
+) : Middleware<ReviewQualityCheckState, ReviewQualityCheckAction> {
+
+    override fun invoke(
+        context: MiddlewareContext<ReviewQualityCheckState, ReviewQualityCheckAction>,
+        next: (ReviewQualityCheckAction) -> Unit,
+        action: ReviewQualityCheckAction,
+    ) {
+        next(action)
+        when (action) {
+            is ReviewQualityCheckAction.NavigationMiddlewareAction -> processAction(action)
+            else -> {
+                // no-op
+            }
+        }
+    }
+
+    private fun processAction(
+        action: ReviewQualityCheckAction.NavigationMiddlewareAction,
+    ) = scope.launch {
+        when (action) {
+            is ReviewQualityCheckAction.OpenLink -> {
+                when (action.link) {
+                    is ReviewQualityCheckState.LinkType.ExternalLink -> openLink(action.link.url, true)
+                    is ReviewQualityCheckState.LinkType.AnalyzeLink -> openLink(action.link.url, false)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNetworkMiddleware.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNetworkMiddleware.kt
index dbda4a6c4..fd2db288e 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNetworkMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNetworkMiddleware.kt
@@ -6,54 +6,114 @@ package org.mozilla.fenix.shopping.middleware
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import mozilla.components.lib.state.Middleware
 import mozilla.components.lib.state.MiddlewareContext
 import mozilla.components.lib.state.Store
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckAction
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckAction.FetchProductAnalysis
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckAction.RetryProductAnalysis
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckMiddleware
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 /**
  * Middleware that handles network requests for the review quality check feature.
  *
  * @property reviewQualityCheckService The service that handles the network requests.
+ * @property networkChecker The [NetworkChecker] instance to check the network status.
  * @property scope The [CoroutineScope] that will be used to launch coroutines.
  */
 class ReviewQualityCheckNetworkMiddleware(
     private val reviewQualityCheckService: ReviewQualityCheckService,
+    private val networkChecker: NetworkChecker,
     private val scope: CoroutineScope,
-) : Middleware<ReviewQualityCheckState, ReviewQualityCheckAction> {
+) : ReviewQualityCheckMiddleware {
 
     override fun invoke(
         context: MiddlewareContext<ReviewQualityCheckState, ReviewQualityCheckAction>,
         next: (ReviewQualityCheckAction) -> Unit,
         action: ReviewQualityCheckAction,
     ) {
+        next(action)
         when (action) {
             is ReviewQualityCheckAction.NetworkAction -> processAction(context.store, action)
             else -> {
                 // no-op
             }
         }
-        next(action)
     }
 
     private fun processAction(
         store: Store<ReviewQualityCheckState, ReviewQualityCheckAction>,
         action: ReviewQualityCheckAction.NetworkAction,
     ) {
-        when (action) {
-            FetchProductAnalysis, RetryProductAnalysis -> {
-                store.dispatch(ReviewQualityCheckAction.UpdateProductReview(ProductReviewState.Loading))
+        if (!networkChecker.isConnected()) {
+            store.updateProductReviewState(ProductReviewState.Error.NetworkError)
+            return
+        }
+
+        scope.launch {
+            when (action) {
+                FetchProductAnalysis, RetryProductAnalysis -> {
+                    val productReviewState = fetchAnalysis()
+                    store.updateProductReviewState(productReviewState)
+                }
+
+                ReviewQualityCheckAction.ReanalyzeProduct -> {
+                    val reanalysis = reviewQualityCheckService.reanalyzeProduct()
+
+                    if (reanalysis == null) {
+                        store.updateProductReviewState(ProductReviewState.Error.GenericError)
+                        return@launch
+                    }
 
-                scope.launch {
-                    val analysis = reviewQualityCheckService.fetchProductReview()
-                    val productReviewState = analysis.toProductReviewState()
-                    store.dispatch(ReviewQualityCheckAction.UpdateProductReview(productReviewState))
+                    val status = pollForAnalysisStatus()
+
+                    if (status == null ||
+                        status == AnalysisStatusDto.PENDING ||
+                        status == AnalysisStatusDto.IN_PROGRESS
+                    ) {
+                        // poll failed, reset to previous state
+                        val state = store.state
+                        if (state is ReviewQualityCheckState.OptedIn) {
+                            if (state.productReviewState is ProductReviewState.NoAnalysisPresent) {
+                                store.updateProductReviewState(ProductReviewState.NoAnalysisPresent())
+                            } else if (state.productReviewState is ProductReviewState.AnalysisPresent) {
+                                store.updateProductReviewState(
+                                    state.productReviewState.copy(
+                                        analysisStatus = AnalysisStatus.NEEDS_ANALYSIS,
+                                    ),
+                                )
+                            }
+                        }
+                    } else {
+                        // poll succeeded, update state
+                        store.updateProductReviewState(status.toProductReviewState())
+                    }
                 }
             }
         }
     }
+
+    private suspend fun fetchAnalysis(): ProductReviewState =
+        reviewQualityCheckService.fetchProductReview().toProductReviewState()
+
+    private suspend fun pollForAnalysisStatus(): AnalysisStatusDto? =
+        retry(
+            predicate = { it == AnalysisStatusDto.PENDING || it == AnalysisStatusDto.IN_PROGRESS },
+            block = { reviewQualityCheckService.analysisStatus() },
+        )
+
+    private suspend fun AnalysisStatusDto.toProductReviewState(): ProductReviewState =
+        when (this) {
+            AnalysisStatusDto.COMPLETED -> fetchAnalysis()
+            AnalysisStatusDto.NOT_ANALYZABLE -> ProductReviewState.Error.UnsupportedProductTypeError
+            else -> ProductReviewState.Error.GenericError
+        }
+
+    private fun Store<ReviewQualityCheckState, ReviewQualityCheckAction>.updateProductReviewState(
+        productReviewState: ProductReviewState,
+    ) {
+        dispatch(ReviewQualityCheckAction.UpdateProductReview(productReviewState))
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferences.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferences.kt
index 8111dc861..af9d82b30 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferences.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferences.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.shopping.middleware
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.utils.Settings
 
 /**
@@ -18,9 +19,10 @@ interface ReviewQualityCheckPreferences {
     suspend fun enabled(): Boolean
 
     /**
-     * Returns true if the user has enabled product recommendations.
+     * Returns true if the user has turned on product recommendations, false if turned off by the
+     * user, null if the product recommendations feature is disabled.
      */
-    suspend fun productRecommendationsEnabled(): Boolean
+    suspend fun productRecommendationsEnabled(): Boolean?
 
     /**
      * Sets whether the user has opted in to the review quality check feature.
@@ -28,9 +30,14 @@ interface ReviewQualityCheckPreferences {
     suspend fun setEnabled(isEnabled: Boolean)
 
     /**
-     * Sets whether the user has enabled product recommendations.
+     * Sets user preference to turn on/off product recommendations.
      */
     suspend fun setProductRecommendationsEnabled(isEnabled: Boolean)
+
+    /**
+     * Updates the condition to display the opted in CFR.
+     */
+    suspend fun updateCFRCondition(time: Long)
 }
 
 /**
@@ -39,7 +46,7 @@ interface ReviewQualityCheckPreferences {
  *
  * @param settings The [Settings] instance to use.
  */
-class ReviewQualityCheckPreferencesImpl(
+class DefaultReviewQualityCheckPreferences(
     private val settings: Settings,
 ) : ReviewQualityCheckPreferences {
 
@@ -47,8 +54,12 @@ class ReviewQualityCheckPreferencesImpl(
         settings.isReviewQualityCheckEnabled
     }
 
-    override suspend fun productRecommendationsEnabled(): Boolean = withContext(Dispatchers.IO) {
-        settings.isReviewQualityCheckProductRecommendationsEnabled
+    override suspend fun productRecommendationsEnabled(): Boolean? = withContext(Dispatchers.IO) {
+        if (FxNimbus.features.shoppingExperience.value().productRecommendations) {
+            settings.isReviewQualityCheckProductRecommendationsEnabled
+        } else {
+            null
+        }
     }
 
     override suspend fun setEnabled(isEnabled: Boolean) {
@@ -58,4 +69,11 @@ class ReviewQualityCheckPreferencesImpl(
     override suspend fun setProductRecommendationsEnabled(isEnabled: Boolean) {
         settings.isReviewQualityCheckProductRecommendationsEnabled = isEnabled
     }
+
+    override suspend fun updateCFRCondition(time: Long) = with(settings) {
+        if (reviewQualityCheckOptInTimeInMillis == 0L) {
+            reviewQualityCheckOptInTimeInMillis = time
+            shouldShowReviewQualityCheckCFR = true
+        }
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferencesMiddleware.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferencesMiddleware.kt
index 14a39a998..8a3409024 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferencesMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckPreferencesMiddleware.kt
@@ -28,6 +28,7 @@ class ReviewQualityCheckPreferencesMiddleware(
         next: (ReviewQualityCheckAction) -> Unit,
         action: ReviewQualityCheckAction,
     ) {
+        next(action)
         when (action) {
             is ReviewQualityCheckAction.PreferencesMiddlewareAction -> {
                 processAction(context.store, action)
@@ -37,8 +38,6 @@ class ReviewQualityCheckPreferencesMiddleware(
                 // no-op
             }
         }
-        // Forward the actions
-        next(action)
     }
 
     private fun processAction(
@@ -73,6 +72,7 @@ class ReviewQualityCheckPreferencesMiddleware(
 
                     // Update the preference
                     reviewQualityCheckPreferences.setEnabled(true)
+                    reviewQualityCheckPreferences.updateCFRCondition(System.currentTimeMillis())
                 }
             }
 
@@ -85,9 +85,13 @@ class ReviewQualityCheckPreferencesMiddleware(
 
             ReviewQualityCheckAction.ToggleProductRecommendation -> {
                 scope.launch {
-                    reviewQualityCheckPreferences.setProductRecommendationsEnabled(
-                        !reviewQualityCheckPreferences.productRecommendationsEnabled(),
-                    )
+                    val productRecommendationsEnabled =
+                        reviewQualityCheckPreferences.productRecommendationsEnabled()
+                    if (productRecommendationsEnabled != null) {
+                        reviewQualityCheckPreferences.setProductRecommendationsEnabled(
+                            !productRecommendationsEnabled,
+                        )
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckService.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckService.kt
index f4e9ee199..ccb1c5a19 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckService.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckService.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.withContext
 import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.shopping.ProductAnalysis
+import mozilla.components.support.base.log.logger.Logger
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -23,6 +24,20 @@ interface ReviewQualityCheckService {
      * @return [ProductAnalysis] if the request succeeds, null otherwise.
      */
     suspend fun fetchProductReview(): ProductAnalysis?
+
+    /**
+     * Triggers a reanalysis of the product review for the current tab.
+     *
+     * @return [AnalysisStatusDto] if the request succeeds, null otherwise.
+     */
+    suspend fun reanalyzeProduct(): AnalysisStatusDto?
+
+    /**
+     * Fetches the status of the product review for the current tab.
+     *
+     * @return [AnalysisStatusDto] if the request succeeds, null otherwise.
+     */
+    suspend fun analysisStatus(): AnalysisStatusDto?
 }
 
 /**
@@ -30,19 +45,98 @@ interface ReviewQualityCheckService {
  *
  * @property browserStore Reference to the application's [BrowserStore] to access state.
  */
-class ReviewQualityCheckServiceImpl(
+class DefaultReviewQualityCheckService(
     private val browserStore: BrowserStore,
 ) : ReviewQualityCheckService {
 
+    private val logger = Logger("DefaultReviewQualityCheckService")
+
     override suspend fun fetchProductReview(): ProductAnalysis? = withContext(Dispatchers.Main) {
         suspendCoroutine { continuation ->
             browserStore.state.selectedTab?.let { tab ->
                 tab.engineState.engineSession?.requestProductAnalysis(
                     url = tab.content.url,
-                    onResult = { continuation.resume(it) },
-                    onException = { continuation.resume(null) },
+                    onResult = {
+                        continuation.resume(it)
+                    },
+                    onException = {
+                        logger.error("Error fetching product review", it)
+                        continuation.resume(null)
+                    },
+                )
+            }
+        }
+    }
+
+    override suspend fun reanalyzeProduct(): AnalysisStatusDto? = withContext(Dispatchers.Main) {
+        suspendCoroutine { continuation ->
+            browserStore.state.selectedTab?.let { tab ->
+                tab.engineState.engineSession?.reanalyzeProduct(
+                    url = tab.content.url,
+                    onResult = {
+                        continuation.resume(it.asEnumOrDefault<AnalysisStatusDto>())
+                    },
+                    onException = {
+                        logger.error("Error starting reanalysis", it)
+                        continuation.resume(null)
+                    },
                 )
             }
         }
     }
+
+    override suspend fun analysisStatus(): AnalysisStatusDto? = withContext(Dispatchers.Main) {
+        suspendCoroutine { continuation ->
+            browserStore.state.selectedTab?.let { tab ->
+                tab.engineState.engineSession?.requestAnalysisStatus(
+                    url = tab.content.url,
+                    onResult = {
+                        continuation.resume(it.asEnumOrDefault<AnalysisStatusDto>())
+                    },
+                    onException = {
+                        logger.error("Error fetching analysis status", it)
+                        continuation.resume(null)
+                    },
+                )
+            }
+        }
+    }
+
+    private inline fun <reified T : Enum<T>> String.asEnumOrDefault(defaultValue: T? = null): T? =
+        enumValues<T>().firstOrNull { it.name.equals(this, ignoreCase = true) } ?: defaultValue
+}
+
+/**
+ * Enum that represents the status of the product review analysis.
+ */
+enum class AnalysisStatusDto {
+    /**
+     * Analysis is waiting to be picked up.
+     */
+    PENDING,
+
+    /**
+     * Analysis is in progress.
+     */
+    IN_PROGRESS,
+
+    /**
+     * Analysis is completed.
+     */
+    COMPLETED,
+
+    /**
+     * Product can not be analyzed.
+     */
+    NOT_ANALYZABLE,
+
+    /**
+     * Current analysis status with provided params not found.
+     */
+    NOT_FOUND,
+
+    /**
+     * Wrong product params provided.
+     */
+    UNPROCESSABLE,
 }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckAction.kt b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckAction.kt
index 2e8bbcb9e..8fa8ee319 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckAction.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckAction.kt
@@ -22,6 +22,11 @@ sealed interface ReviewQualityCheckAction : Action {
      */
     sealed interface PreferencesMiddlewareAction : ReviewQualityCheckAction
 
+    /**
+     * Actions related to navigation events.
+     */
+    sealed interface NavigationMiddlewareAction : ReviewQualityCheckAction
+
     /**
      * Actions related to network requests.
      */
@@ -49,10 +54,14 @@ sealed interface ReviewQualityCheckAction : Action {
 
     /**
      * Triggered as a result of a [PreferencesMiddlewareAction] to update the state.
+     *
+     * @property hasUserOptedIn True when user has opted in for shopping experience.
+     * @property isProductRecommendationsEnabled Reflects the user preference update to display
+     * recommended product. Null when product recommendations feature is disabled.
      */
     data class UpdateUserPreferences(
         val hasUserOptedIn: Boolean,
-        val isProductRecommendationsEnabled: Boolean,
+        val isProductRecommendationsEnabled: Boolean?,
     ) : UpdateAction
 
     /**
@@ -63,10 +72,20 @@ sealed interface ReviewQualityCheckAction : Action {
     /**
      * Triggered when the user has opted in to the review quality check feature and the UI is opened.
      */
-    object FetchProductAnalysis : NetworkAction
+    object FetchProductAnalysis : NetworkAction, UpdateAction
 
     /**
      * Triggered when the user retries to fetch product analysis after a failure.
      */
-    object RetryProductAnalysis : NetworkAction
+    object RetryProductAnalysis : NetworkAction, UpdateAction
+
+    /**
+     * Triggered when the user triggers product re-analysis.
+     */
+    object ReanalyzeProduct : NetworkAction, UpdateAction
+
+    /**
+     * Triggered when opening a link from the review quality check feature.
+     */
+    data class OpenLink(val link: ReviewQualityCheckState.LinkType) : NavigationMiddlewareAction
 }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckState.kt b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckState.kt
index 6fe39b2cd..d3abc7d89 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckState.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckState.kt
@@ -29,11 +29,12 @@ sealed interface ReviewQualityCheckState : State {
      *
      * @property productReviewState The state of the product the user is browsing.
      * @property productRecommendationsPreference User preference whether to show product
-     * recommendations. True if product recommendations should be shown.
+     * recommendations. True if product recommendations should be shown. Null indicates that product
+     * recommendations are disabled.
      */
     data class OptedIn(
         val productReviewState: ProductReviewState = ProductReviewState.Loading,
-        val productRecommendationsPreference: Boolean,
+        val productRecommendationsPreference: Boolean?,
     ) : ReviewQualityCheckState {
 
         /**
@@ -48,20 +49,36 @@ sealed interface ReviewQualityCheckState : State {
             /**
              * Denotes an error has occurred.
              */
-            object Error : ProductReviewState
+            sealed interface Error : ProductReviewState {
+                /**
+                 * Denotes a network error has occurred.
+                 */
+                object NetworkError : Error
+
+                /**
+                 * Denotes a product is not supported.
+                 */
+                object UnsupportedProductTypeError : Error
+
+                /**
+                 * Denotes a generic error has occurred.
+                 */
+                object GenericError : Error
+            }
 
             /**
              * Denotes no analysis is present for the product the user is browsing.
              */
-            object NoAnalysisPresent : ProductReviewState
+            data class NoAnalysisPresent(
+                val isReanalyzing: Boolean = false,
+            ) : ProductReviewState
 
             /**
              * Denotes the state where analysis of the product is fetched and present.
              *
              * @property productId The id of the product, e.g ASIN, SKU.
              * @property reviewGrade The review grade of the product.
-             * @property needsAnalysis If true, the analysis is stale and that to get the fresh
-             * data, re–analysis is needed.
+             * @property analysisStatus The status of the product analysis.
              * @property adjustedRating The adjusted rating taking review quality into consideration.
              * @property productUrl The url of the product the user is browsing.
              * @property highlights Optional highlights based on recent reviews of the product.
@@ -70,7 +87,7 @@ sealed interface ReviewQualityCheckState : State {
             data class AnalysisPresent(
                 val productId: String,
                 val reviewGrade: Grade?,
-                val needsAnalysis: Boolean,
+                val analysisStatus: AnalysisStatus,
                 val adjustedRating: Float?,
                 val productUrl: String,
                 val highlights: SortedMap<HighlightType, List<String>>?,
@@ -82,6 +99,25 @@ sealed interface ReviewQualityCheckState : State {
                             "reviewGrade, adjustedRating or highlights is not null"
                     }
                 }
+
+                val showMoreButtonVisible: Boolean =
+                    highlights != null && highlights != highlights.forCompactMode()
+
+                val highlightsFadeVisible: Boolean =
+                    highlights != null && showMoreButtonVisible &&
+                        highlights.forCompactMode().entries.first().value.size > 1
+
+                val notEnoughReviewsCardVisible: Boolean =
+                    (reviewGrade == null || adjustedRating == null) &&
+                        analysisStatus != AnalysisStatus.NEEDS_ANALYSIS &&
+                        analysisStatus != AnalysisStatus.REANALYZING
+
+                /**
+                 * The status of the product analysis.
+                 */
+                enum class AnalysisStatus {
+                    NEEDS_ANALYSIS, REANALYZING, UP_TO_DATE
+                }
             }
         }
     }
@@ -100,6 +136,21 @@ sealed interface ReviewQualityCheckState : State {
         QUALITY, PRICE, SHIPPING, PACKAGING_AND_APPEARANCE, COMPETITIVENESS
     }
 
+    /**
+     * Types of links that can be opened from the review quality check feature.
+     */
+    sealed class LinkType {
+        /**
+         * Opens a link to analyze a product.
+         */
+        data class AnalyzeLink(val url: String) : LinkType()
+
+        /**
+         * Opens an external "Learn more" link.
+         */
+        data class ExternalLink(val url: String) : LinkType()
+    }
+
     /**
      * The state of the recommended product.
      */
@@ -142,6 +193,17 @@ sealed interface ReviewQualityCheckState : State {
             val analysisUrl: String,
         ) : RecommendedProductState
     }
+
+    /**
+     * Returns [ReviewQualityCheckState] applying the given [transform] function if the current
+     * state is [OptedIn].
+     */
+    fun mapIfOptedIn(transform: (OptedIn) -> ReviewQualityCheckState): ReviewQualityCheckState =
+        if (this is OptedIn) {
+            transform(this)
+        } else {
+            this
+        }
 }
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStore.kt b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStore.kt
index 491d901a4..363f1f05b 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStore.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStore.kt
@@ -5,6 +5,8 @@
 package org.mozilla.fenix.shopping.store
 
 import mozilla.components.lib.state.Store
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 /**
  * Store for review quality check feature.
@@ -58,7 +60,7 @@ private fun mapStateForUpdateAction(
         }
 
         ReviewQualityCheckAction.ToggleProductRecommendation -> {
-            if (state is ReviewQualityCheckState.OptedIn) {
+            if (state is ReviewQualityCheckState.OptedIn && state.productRecommendationsPreference != null) {
                 state.copy(productRecommendationsPreference = !state.productRecommendationsPreference)
             } else {
                 state
@@ -66,10 +68,34 @@ private fun mapStateForUpdateAction(
         }
 
         is ReviewQualityCheckAction.UpdateProductReview -> {
-            if (state is ReviewQualityCheckState.OptedIn) {
-                state.copy(productReviewState = action.productReviewState)
-            } else {
-                state
+            state.mapIfOptedIn {
+                it.copy(productReviewState = action.productReviewState)
+            }
+        }
+
+        ReviewQualityCheckAction.FetchProductAnalysis, ReviewQualityCheckAction.RetryProductAnalysis -> {
+            state.mapIfOptedIn {
+                it.copy(productReviewState = ProductReviewState.Loading)
+            }
+        }
+
+        ReviewQualityCheckAction.ReanalyzeProduct -> {
+            state.mapIfOptedIn {
+                when (it.productReviewState) {
+                    is ProductReviewState.AnalysisPresent -> {
+                        val productReviewState =
+                            it.productReviewState.copy(analysisStatus = AnalysisStatus.REANALYZING)
+                        it.copy(productReviewState = productReviewState)
+                    }
+
+                    is ProductReviewState.NoAnalysisPresent -> {
+                        it.copy(productReviewState = it.productReviewState.copy(isReanalyzing = true))
+                    }
+
+                    else -> {
+                        it
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/NoAnalysis.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/NoAnalysis.kt
new file mode 100644
index 000000000..3748f33e3
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/NoAnalysis.kt
@@ -0,0 +1,185 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * No analysis UI for review quality check content.
+ *
+ * @param isAnalyzing Whether or not the displayed product is being analyzed.
+ * @param productRecommendationsEnabled The current state of the product recommendations toggle.
+ * @param onAnalyzeClick Invoked when the user clicks on the check review button.
+ * @param onReviewGradeLearnMoreClick Invoked when the user clicks to learn more about review grades.
+ * @param onOptOutClick Invoked when the user opts out of the review quality check feature.
+ * @param onProductRecommendationsEnabledStateChange Invoked when the user changes the product
+ * recommendations toggle state.
+ * @param modifier Modifier to be applied to the composable.
+ */
+@Suppress("LongParameterList")
+@Composable
+fun NoAnalysis(
+    isAnalyzing: Boolean,
+    productRecommendationsEnabled: Boolean?,
+    onAnalyzeClick: () -> Unit,
+    onReviewGradeLearnMoreClick: (String) -> Unit,
+    onOptOutClick: () -> Unit,
+    onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        ReviewQualityNoAnalysisCard(isAnalyzing, onAnalyzeClick)
+
+        ReviewQualityInfoCard(
+            onLearnMoreClick = onReviewGradeLearnMoreClick,
+        )
+
+        ReviewQualityCheckSettingsCard(
+            productRecommendationsEnabled = productRecommendationsEnabled,
+            onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
+            onTurnOffReviewQualityCheckClick = onOptOutClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun ReviewQualityNoAnalysisCard(
+    isAnalyzing: Boolean,
+    onAnalyzeClick: () -> Unit,
+) {
+    ReviewQualityCheckCard(
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.shopping_no_analysis),
+            contentDescription = null,
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(all = 10.dp),
+        )
+
+        Spacer(Modifier.height(8.dp))
+
+        if (isAnalyzing) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                IndeterminateProgressIndicator(
+                    Modifier.size(24.dp),
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                Text(
+                    text = stringResource(id = R.string.review_quality_check_analysis_in_progress_warning_title),
+                    style = FirefoxTheme.typography.headline8,
+                    color = FirefoxTheme.colors.textPrimary,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            }
+
+            Spacer(Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(id = R.string.review_quality_check_analysis_in_progress_warning_body),
+                style = FirefoxTheme.typography.body2,
+                color = FirefoxTheme.colors.textSecondary,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        } else {
+            Text(
+                text = stringResource(id = R.string.review_quality_check_no_analysis_title),
+                style = FirefoxTheme.typography.headline8,
+                color = FirefoxTheme.colors.textPrimary,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(id = R.string.review_quality_check_no_analysis_body),
+                style = FirefoxTheme.typography.body2,
+                color = FirefoxTheme.colors.textSecondary,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(8.dp))
+
+            TextButton(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(
+                        color = FirefoxTheme.colors.actionPrimary,
+                        shape = RoundedCornerShape(4.dp),
+                    ),
+                onClick = onAnalyzeClick,
+            ) {
+                Text(
+                    text = stringResource(id = R.string.review_quality_check_no_analysis_link),
+                    color = FirefoxTheme.colors.textOnColorPrimary,
+                    style = FirefoxTheme.typography.headline8,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+@LightDarkPreview
+private fun NoAnalysisPreview() {
+    var isAnalyzing by remember { mutableStateOf(false) }
+
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            NoAnalysis(
+                isAnalyzing = isAnalyzing,
+                onAnalyzeClick = { isAnalyzing = !isAnalyzing },
+                productRecommendationsEnabled = false,
+                onReviewGradeLearnMoreClick = {},
+                onOptOutClick = {},
+                onProductRecommendationsEnabledStateChange = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysis.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysis.kt
index 4f7668d93..e8989b404 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysis.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysis.kt
@@ -32,17 +32,19 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import org.mozilla.fenix.R
-import org.mozilla.fenix.compose.ClickableSubstringLink
-import org.mozilla.fenix.compose.SwitchWithLabel
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.compose.button.SecondaryButton
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.HighlightType
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 import org.mozilla.fenix.shopping.store.forCompactMode
 import org.mozilla.fenix.theme.FirefoxTheme
+import java.util.SortedMap
 
 /**
  * UI for review quality check content displaying product analysis.
@@ -53,21 +55,48 @@ import org.mozilla.fenix.theme.FirefoxTheme
  * @param onProductRecommendationsEnabledStateChange Invoked when the user changes the product
  * recommendations toggle state.
  * @param onReviewGradeLearnMoreClick Invoked when the user clicks to learn more about review grades.
+ * @param onFooterLinkClick Invoked when the user clicks on the footer link.
  * @param modifier The modifier to be applied to the Composable.
  */
 @Composable
+@Suppress("LongParameterList")
 fun ProductAnalysis(
-    productRecommendationsEnabled: Boolean,
+    productRecommendationsEnabled: Boolean?,
     productAnalysis: AnalysisPresent,
     onOptOutClick: () -> Unit,
+    onReanalyzeClick: () -> Unit,
     onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
-    onReviewGradeLearnMoreClick: () -> Unit,
+    onReviewGradeLearnMoreClick: (String) -> Unit,
+    onFooterLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
+        when (productAnalysis.analysisStatus) {
+            AnalysisStatus.NEEDS_ANALYSIS -> {
+                ReanalyzeCard(onReanalyzeClick = onReanalyzeClick)
+            }
+
+            AnalysisStatus.REANALYZING -> {
+                ReanalysisInProgressCard()
+            }
+
+            AnalysisStatus.UP_TO_DATE -> {
+                // no-op
+            }
+        }
+
+        if (productAnalysis.notEnoughReviewsCardVisible) {
+            ReviewQualityCheckInfoCard(
+                title = stringResource(id = R.string.review_quality_check_no_reviews_warning_title),
+                description = stringResource(id = R.string.review_quality_check_no_reviews_warning_body),
+                type = ReviewQualityCheckInfoType.Info,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
         if (productAnalysis.reviewGrade != null) {
             ReviewGradeCard(
                 reviewGrade = productAnalysis.reviewGrade,
@@ -85,36 +114,54 @@ fun ProductAnalysis(
         if (productAnalysis.highlights != null) {
             HighlightsCard(
                 highlights = productAnalysis.highlights,
+                highlightsFadeVisible = productAnalysis.highlightsFadeVisible,
+                showMoreButtonVisible = productAnalysis.showMoreButtonVisible,
                 modifier = Modifier.fillMaxWidth(),
             )
-
-            Text(
-                text = stringResource(R.string.review_quality_check_highlights_caption),
-                color = FirefoxTheme.colors.textPrimary,
-                style = FirefoxTheme.typography.caption,
-                modifier = Modifier.padding(horizontal = 16.dp),
-            )
         }
 
-        ReviewQualityCheckExpandableCard(
-            title = stringResource(id = R.string.review_quality_check_info_title),
+        ReviewQualityInfoCard(
             modifier = Modifier.fillMaxWidth(),
-        ) {
-            ReviewQualityInfo(
-                modifier = Modifier.fillMaxWidth(),
-                onLearnMoreClick = onReviewGradeLearnMoreClick,
-            )
-        }
+            onLearnMoreClick = onReviewGradeLearnMoreClick,
+        )
 
-        SettingsCard(
-            modifier = Modifier.fillMaxWidth(),
+        ReviewQualityCheckSettingsCard(
             productRecommendationsEnabled = productRecommendationsEnabled,
             onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
             onTurnOffReviewQualityCheckClick = onOptOutClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        ReviewQualityCheckFooter(
+            onLinkClick = onFooterLinkClick,
         )
     }
 }
 
+@Composable
+private fun ReanalyzeCard(
+    onReanalyzeClick: () -> Unit,
+) {
+    ReviewQualityCheckInfoCard(
+        title = stringResource(R.string.review_quality_check_outdated_analysis_warning_title),
+        type = ReviewQualityCheckInfoType.AnalysisUpdate,
+        modifier = Modifier.fillMaxWidth(),
+        buttonText = InfoCardButtonText(
+            text = stringResource(R.string.review_quality_check_outdated_analysis_warning_action),
+            onClick = onReanalyzeClick,
+        ),
+    )
+}
+
+@Composable
+private fun ReanalysisInProgressCard() {
+    ReviewQualityCheckInfoCard(
+        title = stringResource(R.string.review_quality_check_reanalysis_in_progress_warning_title),
+        type = ReviewQualityCheckInfoType.Loading,
+        modifier = Modifier.fillMaxWidth(),
+    )
+}
+
 @Composable
 private fun ReviewGradeCard(
     reviewGrade: ReviewQualityCheckState.Grade,
@@ -170,6 +217,8 @@ private fun AdjustedProductRatingCard(
 @Composable
 private fun HighlightsCard(
     highlights: Map<HighlightType, List<String>>,
+    highlightsFadeVisible: Boolean,
+    showMoreButtonVisible: Boolean,
     modifier: Modifier = Modifier,
 ) {
     ReviewQualityCheckCard(modifier = modifier) {
@@ -221,7 +270,7 @@ private fun HighlightsCard(
                 targetState = isExpanded,
                 label = "HighlightsCard-Crossfade",
             ) { expanded ->
-                if (expanded.not()) {
+                if (expanded.not() && highlightsFadeVisible) {
                     Spacer(
                         modifier = Modifier
                             .height(32.dp)
@@ -239,16 +288,18 @@ private fun HighlightsCard(
             }
         }
 
-        Spacer(modifier = Modifier.height(8.dp))
+        if (showMoreButtonVisible) {
+            Spacer(modifier = Modifier.height(8.dp))
 
-        SecondaryButton(
-            text = if (isExpanded) {
-                stringResource(R.string.review_quality_check_highlights_show_less)
-            } else {
-                stringResource(R.string.review_quality_check_highlights_show_more)
-            },
-            onClick = { isExpanded = isExpanded.not() },
-        )
+            SecondaryButton(
+                text = if (isExpanded) {
+                    stringResource(R.string.review_quality_check_highlights_show_less)
+                } else {
+                    stringResource(R.string.review_quality_check_highlights_show_more)
+                },
+                onClick = { isExpanded = isExpanded.not() },
+            )
+        }
     }
 }
 
@@ -290,126 +341,6 @@ private fun HighlightTitle(highlightType: HighlightType) {
     }
 }
 
-@Composable
-private fun SettingsCard(
-    productRecommendationsEnabled: Boolean,
-    onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
-    onTurnOffReviewQualityCheckClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    ReviewQualityCheckExpandableCard(
-        modifier = modifier,
-        title = stringResource(R.string.review_quality_check_settings_title),
-    ) {
-        Column {
-            Spacer(modifier = Modifier.height(8.dp))
-
-            SwitchWithLabel(
-                checked = productRecommendationsEnabled,
-                onCheckedChange = onProductRecommendationsEnabledStateChange,
-                label = stringResource(R.string.review_quality_check_settings_recommended_products),
-            )
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            SecondaryButton(
-                text = stringResource(R.string.review_quality_check_settings_turn_off),
-                onClick = onTurnOffReviewQualityCheckClick,
-            )
-        }
-    }
-}
-
-@Suppress("Deprecation")
-@Composable
-private fun ReviewQualityInfo(
-    modifier: Modifier = Modifier,
-    onLearnMoreClick: () -> Unit,
-) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(24.dp),
-    ) {
-        // Any and all text formatting (bullets, inline substring bolding, etc.) will be handled as
-        // follow-up when the copy is finalized.
-        // Bug 1848219
-        Text(
-            text = stringResource(id = R.string.review_quality_check_info_overview),
-            color = FirefoxTheme.colors.textPrimary,
-            style = FirefoxTheme.typography.body2,
-        )
-
-        val link = stringResource(R.string.review_quality_check_info_learn_more_link)
-        val text = stringResource(R.string.review_quality_check_info_learn_more, link)
-        val linkStartIndex = text.indexOf(link)
-        val linkEndIndex = linkStartIndex + link.length
-        ClickableSubstringLink(
-            text = text,
-            textStyle = FirefoxTheme.typography.body2,
-            clickableStartIndex = linkStartIndex,
-            clickableEndIndex = linkEndIndex,
-            onClick = onLearnMoreClick,
-        )
-
-        Text(
-            text = stringResource(id = R.string.review_quality_check_info_review_grade_header),
-            color = FirefoxTheme.colors.textPrimary,
-            style = FirefoxTheme.typography.body2,
-        )
-
-        ReviewGradingScaleInfo(
-            reviewGrades = listOf(
-                ReviewQualityCheckState.Grade.A,
-                ReviewQualityCheckState.Grade.B,
-            ),
-            info = stringResource(id = R.string.review_quality_check_info_grade_info_AB),
-            modifier = Modifier.fillMaxWidth(),
-        )
-
-        ReviewGradingScaleInfo(
-            reviewGrades = listOf(ReviewQualityCheckState.Grade.C),
-            info = stringResource(id = R.string.review_quality_check_info_grade_info_C),
-            modifier = Modifier.fillMaxWidth(),
-        )
-
-        ReviewGradingScaleInfo(
-            reviewGrades = listOf(
-                ReviewQualityCheckState.Grade.D,
-                ReviewQualityCheckState.Grade.F,
-            ),
-            info = stringResource(id = R.string.review_quality_check_info_grade_info_DF),
-            modifier = Modifier.fillMaxWidth(),
-        )
-    }
-}
-
-@Composable
-private fun ReviewGradingScaleInfo(
-    reviewGrades: List<ReviewQualityCheckState.Grade>,
-    info: String,
-    modifier: Modifier = Modifier,
-) {
-    Row(
-        modifier = modifier.semantics(mergeDescendants = true) {},
-        verticalAlignment = Alignment.Top,
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        reviewGrades.forEach { grade ->
-            ReviewGradeCompact(grade = grade)
-        }
-
-        if (reviewGrades.size == 1) {
-            Spacer(modifier = Modifier.width(24.dp))
-        }
-
-        Text(
-            text = info,
-            color = FirefoxTheme.colors.textPrimary,
-            style = FirefoxTheme.typography.body2,
-        )
-    }
-}
-
 private fun HighlightType.toHighlight() =
     when (this) {
         HighlightType.QUALITY -> Highlight.QUALITY
@@ -419,101 +350,132 @@ private fun HighlightType.toHighlight() =
         HighlightType.COMPETITIVENESS -> Highlight.COMPETITIVENESS
     }
 
-// As part of Bug 1841600, update iconResourceId for each highlight type.
 private enum class Highlight(
     val titleResourceId: Int,
     val iconResourceId: Int,
 ) {
     QUALITY(
         titleResourceId = R.string.review_quality_check_highlights_type_quality,
-        iconResourceId = R.drawable.ic_shopping_cart,
+        iconResourceId = R.drawable.mozac_ic_quality_24,
     ),
     PRICE(
         titleResourceId = R.string.review_quality_check_highlights_type_price,
-        iconResourceId = R.drawable.ic_shopping_cart,
+        iconResourceId = R.drawable.mozac_ic_price_24,
     ),
     SHIPPING(
         titleResourceId = R.string.review_quality_check_highlights_type_shipping,
-        iconResourceId = R.drawable.ic_shopping_cart,
+        iconResourceId = R.drawable.mozac_ic_shipping_24,
     ),
     PACKAGING_AND_APPEARANCE(
         titleResourceId = R.string.review_quality_check_highlights_type_packaging_appearance,
-        iconResourceId = R.drawable.ic_shopping_cart,
+        iconResourceId = R.drawable.mozac_ic_packaging_24,
     ),
     COMPETITIVENESS(
         titleResourceId = R.string.review_quality_check_highlights_type_competitiveness,
-        iconResourceId = R.drawable.ic_shopping_cart,
+        iconResourceId = R.drawable.mozac_ic_competitiveness_24,
     ),
 }
 
+private class ProductAnalysisPreviewModel(
+    val productRecommendationsEnabled: Boolean?,
+    val productAnalysis: AnalysisPresent,
+) {
+    constructor(
+        productRecommendationsEnabled: Boolean? = false,
+        productId: String = "123",
+        reviewGrade: ReviewQualityCheckState.Grade? = ReviewQualityCheckState.Grade.B,
+        analysisStatus: AnalysisStatus = AnalysisStatus.UP_TO_DATE,
+        adjustedRating: Float? = 3.6f,
+        productUrl: String = "",
+        highlights: SortedMap<HighlightType, List<String>>? = sortedMapOf(
+            HighlightType.QUALITY to listOf(
+                "High quality",
+                "Excellent craftsmanship",
+                "Superior materials",
+            ),
+            HighlightType.PRICE to listOf(
+                "Affordable prices",
+                "Great value for money",
+                "Discounted offers",
+            ),
+            HighlightType.SHIPPING to listOf(
+                "Fast and reliable shipping",
+                "Free shipping options",
+                "Express delivery",
+            ),
+            HighlightType.PACKAGING_AND_APPEARANCE to listOf(
+                "Elegant packaging",
+                "Attractive appearance",
+                "Beautiful design",
+            ),
+            HighlightType.COMPETITIVENESS to listOf(
+                "Competitive pricing",
+                "Strong market presence",
+                "Unbeatable deals",
+            ),
+        ),
+        recommendedProductState: ReviewQualityCheckState.RecommendedProductState =
+            ReviewQualityCheckState.RecommendedProductState.Initial,
+    ) : this(
+        productRecommendationsEnabled = productRecommendationsEnabled,
+        productAnalysis = AnalysisPresent(
+            productId = productId,
+            reviewGrade = reviewGrade,
+            analysisStatus = analysisStatus,
+            adjustedRating = adjustedRating,
+            productUrl = productUrl,
+            highlights = highlights,
+            recommendedProductState = recommendedProductState,
+        ),
+    )
+}
+
+private class ProductAnalysisPreviewModelParameterProvider :
+    PreviewParameterProvider<ProductAnalysisPreviewModel> {
+    override val values: Sequence<ProductAnalysisPreviewModel>
+        get() = sequenceOf(
+            ProductAnalysisPreviewModel(),
+            ProductAnalysisPreviewModel(
+                analysisStatus = AnalysisStatus.NEEDS_ANALYSIS,
+            ),
+            ProductAnalysisPreviewModel(
+                analysisStatus = AnalysisStatus.REANALYZING,
+            ),
+            ProductAnalysisPreviewModel(
+                reviewGrade = null,
+            ),
+            ProductAnalysisPreviewModel(
+                highlights = sortedMapOf(
+                    HighlightType.QUALITY to listOf(
+                        "High quality",
+                        "Excellent craftsmanship",
+                    ),
+                ),
+            ),
+        )
+}
+
 @Composable
 @LightDarkPreview
-private fun ProductAnalysisPreview() {
+private fun ProductAnalysisPreview(
+    @PreviewParameter(ProductAnalysisPreviewModelParameterProvider::class) model: ProductAnalysisPreviewModel,
+) {
     FirefoxTheme {
         ReviewQualityCheckScaffold(
             onRequestDismiss = {},
         ) {
-            val productRecommendationsEnabled = remember { mutableStateOf(false) }
+            var productRecommendationsEnabled by remember { mutableStateOf(model.productRecommendationsEnabled) }
 
             ProductAnalysis(
-                productRecommendationsEnabled = productRecommendationsEnabled.value,
-                productAnalysis = AnalysisPresent(
-                    productId = "123",
-                    reviewGrade = ReviewQualityCheckState.Grade.B,
-                    needsAnalysis = false,
-                    adjustedRating = 3.6f,
-                    productUrl = "123",
-                    highlights = sortedMapOf(
-                        HighlightType.QUALITY to listOf(
-                            "High quality",
-                            "Excellent craftsmanship",
-                            "Superior materials",
-                        ),
-                        HighlightType.PRICE to listOf(
-                            "Affordable prices",
-                            "Great value for money",
-                            "Discounted offers",
-                        ),
-                        HighlightType.SHIPPING to listOf(
-                            "Fast and reliable shipping",
-                            "Free shipping options",
-                            "Express delivery",
-                        ),
-                        HighlightType.PACKAGING_AND_APPEARANCE to listOf(
-                            "Elegant packaging",
-                            "Attractive appearance",
-                            "Beautiful design",
-                        ),
-                        HighlightType.COMPETITIVENESS to listOf(
-                            "Competitive pricing",
-                            "Strong market presence",
-                            "Unbeatable deals",
-                        ),
-                    ),
-                ),
+                productRecommendationsEnabled = productRecommendationsEnabled,
+                productAnalysis = model.productAnalysis,
                 onOptOutClick = {},
+                onReanalyzeClick = {},
                 onProductRecommendationsEnabledStateChange = {
-                    productRecommendationsEnabled.value = it
+                    productRecommendationsEnabled = it
                 },
                 onReviewGradeLearnMoreClick = {},
-            )
-        }
-    }
-}
-
-@Composable
-@LightDarkPreview
-private fun ReviewQualityInfoPreview() {
-    FirefoxTheme {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(color = FirefoxTheme.colors.layer1)
-                .padding(all = 16.dp),
-        ) {
-            ReviewQualityInfo(
-                modifier = Modifier.fillMaxWidth(),
-                onLearnMoreClick = {},
+                onFooterLinkClick = {},
             )
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysisError.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysisError.kt
new file mode 100644
index 000000000..aa89d0585
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProductAnalysisError.kt
@@ -0,0 +1,125 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * Product analysis error UI
+ *
+ * @param error The error state to display.
+ * @param productRecommendationsEnabled The current state of the product recommendations toggle.
+ * @param onReviewGradeLearnMoreClick Invoked when the user clicks to learn more about review grades.
+ * @param onOptOutClick Invoked when the user opts out of the review quality check feature.
+ * @param onProductRecommendationsEnabledStateChange Invoked when the user changes the product
+ * recommendations toggle state.
+ * @param onFooterLinkClick Invoked when the user clicks on the footer link.
+ * @param modifier Modifier to apply to the layout.
+ */
+@Composable
+@Suppress("LongParameterList")
+fun ProductAnalysisError(
+    error: ProductReviewState.Error,
+    productRecommendationsEnabled: Boolean?,
+    onReviewGradeLearnMoreClick: (String) -> Unit,
+    onOptOutClick: () -> Unit,
+    onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
+    onFooterLinkClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        val (
+            @StringRes titleResourceId: Int,
+            @StringRes descriptionResourceId: Int,
+            type: ReviewQualityCheckInfoType,
+        ) = when (error) {
+            ProductReviewState.Error.GenericError -> {
+                Triple(
+                    R.string.review_quality_check_generic_error_title,
+                    R.string.review_quality_check_generic_error_body,
+                    ReviewQualityCheckInfoType.Info,
+                )
+            }
+
+            ProductReviewState.Error.NetworkError -> {
+                Triple(
+                    R.string.review_quality_check_no_connection_title,
+                    R.string.review_quality_check_no_connection_body,
+                    ReviewQualityCheckInfoType.Warning,
+                )
+            }
+
+            ProductReviewState.Error.UnsupportedProductTypeError -> {
+                Triple(
+                    R.string.review_quality_check_not_analyzable_info_title,
+                    R.string.review_quality_check_not_analyzable_info_body,
+                    ReviewQualityCheckInfoType.Info,
+                )
+            }
+        }
+
+        ReviewQualityCheckInfoCard(
+            title = stringResource(id = titleResourceId),
+            description = stringResource(id = descriptionResourceId),
+            type = type,
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        ReviewQualityInfoCard(
+            onLearnMoreClick = onReviewGradeLearnMoreClick,
+        )
+
+        ReviewQualityCheckSettingsCard(
+            productRecommendationsEnabled = productRecommendationsEnabled,
+            onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
+            onTurnOffReviewQualityCheckClick = onOptOutClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        ReviewQualityCheckFooter(
+            onLinkClick = onFooterLinkClick,
+        )
+    }
+}
+
+@Composable
+@LightDarkPreview
+private fun ProductAnalysisErrorPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            ProductAnalysisError(
+                error = ProductReviewState.Error.NetworkError,
+                productRecommendationsEnabled = true,
+                onReviewGradeLearnMoreClick = {},
+                onOptOutClick = {},
+                onProductRecommendationsEnabledStateChange = {},
+                onFooterLinkClick = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ProgressIndicator.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProgressIndicator.kt
new file mode 100644
index 000000000..3ab4beabb
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ProgressIndicator.kt
@@ -0,0 +1,56 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * UI displaying a circular progress indicator continuously loading.
+ *
+ * @param modifier [Modifier] to be applied to the indicator.
+ */
+@Composable
+fun IndeterminateProgressIndicator(
+    modifier: Modifier = Modifier,
+) {
+    CircularProgressIndicator(
+        modifier = modifier,
+        color = FirefoxTheme.colors.actionPrimary,
+        strokeWidth = 2.dp,
+        strokeCap = StrokeCap.Round,
+    )
+}
+
+@LightDarkPreview
+@Composable
+private fun ProgressIndicatorPreview() {
+    FirefoxTheme {
+        Column(
+            modifier = Modifier
+                .background(FirefoxTheme.colors.layer1)
+                .width(50.dp)
+                .height(50.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.SpaceEvenly,
+        ) {
+            IndeterminateProgressIndicator(
+                modifier = Modifier.size(25.dp),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewGrade.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewGrade.kt
index 397b78ca9..822197aef 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewGrade.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewGrade.kt
@@ -34,16 +34,16 @@ import org.mozilla.fenix.theme.FirefoxTheme
 
 private val height = 24.dp
 private val borderColor = Color(0x26000000)
-private val reviewGradeAColor = Color(0xFF10AD56)
-private val reviewGradeBColor = Color(0xFF007DEC)
-private val reviewGradeCColor = Color(0xFFF4A902)
-private val reviewGradeDColor = Color(0xFFF27313)
-private val reviewGradeFColor = Color(0xFFD51235)
-private val reviewGradeAColorExpanded = Color(0xFFDBF3E6)
-private val reviewGradeBColorExpanded = Color(0xFFD9ECFC)
-private val reviewGradeCColorExpanded = Color(0xFFFDF2D9)
-private val reviewGradeDColorExpanded = Color(0xFFFDEADC)
-private val reviewGradeFColorExpanded = Color(0xFFF9DBE1)
+private val reviewGradeAColor = PhotonColors.Green20
+private val reviewGradeBColor = PhotonColors.Blue10
+private val reviewGradeCColor = PhotonColors.Yellow20
+private val reviewGradeDColor = PhotonColors.Orange20
+private val reviewGradeFColor = PhotonColors.Red30
+private val reviewGradeAColorExpanded = Color(0xFFEEFFF9)
+private val reviewGradeBColorExpanded = Color(0xFFDEFAFF)
+private val reviewGradeCColorExpanded = Color(0xFFFFF9DA)
+private val reviewGradeDColorExpanded = Color(0xFFFDEEE2)
+private val reviewGradeFColorExpanded = Color(0xFFFFEFF0)
 
 /**
  * Review Grade of the product - A being the best and F being the worst.
@@ -169,7 +169,7 @@ private fun ReviewGradeLetter(
     ) {
         Text(
             text = reviewGrade.name,
-            color = PhotonColors.LightGrey05,
+            color = PhotonColors.Black,
             style = FirefoxTheme.typography.subtitle2,
         )
     }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt
index 0d9d0c4cb..9bd65ea76 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.shopping.ui
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -55,11 +56,25 @@ fun ReviewQualityCheckBottomSheet(
                         onRequestDismiss()
                         store.dispatch(ReviewQualityCheckAction.OptOut)
                     },
+                    onReanalyzeClick = {
+                        store.dispatch(ReviewQualityCheckAction.ReanalyzeProduct)
+                    },
                     onProductRecommendationsEnabledStateChange = {
                         store.dispatch(ReviewQualityCheckAction.ToggleProductRecommendation)
                     },
-                    onReviewGradeLearnMoreClick = {
-                        // Bug 1847740
+                    onReviewGradeLearnMoreClick = { url ->
+                        store.dispatch(
+                            ReviewQualityCheckAction.OpenLink(
+                                ReviewQualityCheckState.LinkType.ExternalLink(url),
+                            ),
+                        )
+                    },
+                    onFooterLinkClick = { url ->
+                        store.dispatch(
+                            ReviewQualityCheckAction.OpenLink(
+                                ReviewQualityCheckState.LinkType.ExternalLink(url),
+                            ),
+                        )
                     },
                 )
             }
@@ -76,11 +91,14 @@ fun ReviewQualityCheckBottomSheet(
 }
 
 @Composable
+@Suppress("LongParameterList")
 private fun ProductReview(
     state: ReviewQualityCheckState.OptedIn,
     onOptOutClick: () -> Unit,
+    onReanalyzeClick: () -> Unit,
     onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
-    onReviewGradeLearnMoreClick: () -> Unit,
+    onReviewGradeLearnMoreClick: (String) -> Unit,
+    onFooterLinkClick: (String) -> Unit,
 ) {
     Crossfade(
         targetState = state.productReviewState,
@@ -92,13 +110,23 @@ private fun ProductReview(
                     productRecommendationsEnabled = state.productRecommendationsPreference,
                     productAnalysis = productReviewState,
                     onOptOutClick = onOptOutClick,
+                    onReanalyzeClick = onReanalyzeClick,
                     onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
                     onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick,
+                    onFooterLinkClick = onFooterLinkClick,
                 )
             }
 
             is ReviewQualityCheckState.OptedIn.ProductReviewState.Error -> {
-                // Bug 1840113
+                ProductAnalysisError(
+                    error = productReviewState,
+                    productRecommendationsEnabled = state.productRecommendationsPreference,
+                    onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick,
+                    onOptOutClick = onOptOutClick,
+                    onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
+                    onFooterLinkClick = onFooterLinkClick,
+                    modifier = Modifier.fillMaxWidth(),
+                )
             }
 
             is ReviewQualityCheckState.OptedIn.ProductReviewState.Loading -> {
@@ -106,7 +134,15 @@ private fun ProductReview(
             }
 
             is ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent -> {
-                // Bug 1840333
+                NoAnalysis(
+                    productRecommendationsEnabled = state.productRecommendationsPreference,
+                    isAnalyzing = productReviewState.isReanalyzing,
+                    onAnalyzeClick = onReanalyzeClick,
+                    onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick,
+                    onOptOutClick = onOptOutClick,
+                    onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
+                    modifier = Modifier.fillMaxWidth(),
+                )
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckCards.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckCards.kt
index 9f8e109c4..af739141d 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckCards.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckCards.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -53,7 +54,7 @@ fun ReviewQualityCheckExpandableCard(
 ) {
     ReviewQualityCheckCard(
         modifier = modifier,
-        contentPadding = 0.dp,
+        contentPadding = PaddingValues(0.dp),
     ) {
         var isExpanded by remember { mutableStateOf(false) }
 
@@ -113,7 +114,7 @@ fun ReviewQualityCheckCard(
     modifier: Modifier,
     backgroundColor: Color = FirefoxTheme.colors.layer2,
     elevation: Dp = defaultCardElevation,
-    contentPadding: Dp = defaultCardContentPadding,
+    contentPadding: PaddingValues = PaddingValues(defaultCardContentPadding),
     content: @Composable ColumnScope.() -> Unit,
 ) {
     Card(
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
index f3b349ce3..c92e804d3 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt
@@ -13,6 +13,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.mozilla.fenix.R
@@ -44,7 +47,21 @@ fun ColumnScope.ReviewQualityCheckContextualOnboarding(
         Spacer(modifier = Modifier.height(16.dp))
 
         Text(
-            text = stringResource(R.string.review_quality_check_contextual_onboarding_description),
+            text = createDescriptionString(),
+            color = FirefoxTheme.colors.textPrimary,
+            style = FirefoxTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.align(Alignment.CenterHorizontally),
+        )
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        Text(
+            text = stringResource(
+                id = R.string.review_quality_check_contextual_onboarding_learn_more,
+                stringResource(id = R.string.shopping_product_name),
+                stringResource(id = R.string.review_quality_check_contextual_onboarding_learn_more_link),
+            ),
             color = FirefoxTheme.colors.textPrimary,
             style = FirefoxTheme.typography.body2,
             textAlign = TextAlign.Center,
@@ -70,10 +87,44 @@ fun ColumnScope.ReviewQualityCheckContextualOnboarding(
     Spacer(modifier = Modifier.height(8.dp))
 
     Text(
-        text = stringResource(R.string.review_quality_check_contextual_onboarding_caption),
+        text = stringResource(
+            R.string.review_quality_check_contextual_onboarding_caption,
+            stringResource(R.string.shopping_product_name),
+            stringResource(id = R.string.review_quality_check_contextual_onboarding_privacy_policy),
+            stringResource(id = R.string.review_quality_check_contextual_onboarding_terms_use),
+        ),
         color = FirefoxTheme.colors.textPrimary,
         style = FirefoxTheme.typography.caption,
         textAlign = TextAlign.Center,
         modifier = Modifier.align(Alignment.CenterHorizontally),
     )
 }
+
+@Composable
+private fun createDescriptionString(
+    retailers: List<Int> = listOf(
+        R.string.review_quality_check_retailer_name_amazon,
+        R.string.review_quality_check_retailer_name_bestbuy,
+        R.string.review_quality_check_retailer_name_walmart,
+    ),
+) = buildAnnotatedString {
+    val description = stringResource(
+        id = R.string.review_quality_check_contextual_onboarding_description,
+        stringResource(retailers[0]),
+        stringResource(R.string.app_name),
+        stringResource(retailers[1]),
+        stringResource(retailers[2]),
+    )
+    append(description)
+
+    retailers.forEach {
+        val retailer = stringResource(id = it)
+        val start = description.indexOf(retailer)
+
+        addStyle(
+            style = SpanStyle(fontWeight = FontWeight.Bold),
+            start = start,
+            end = start + retailer.length,
+        )
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckFooter.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckFooter.kt
new file mode 100644
index 000000000..a448a9964
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckFooter.kt
@@ -0,0 +1,69 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.LinkText
+import org.mozilla.fenix.compose.LinkTextState
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.theme.FirefoxTheme
+
+private const val FOOTER_LINK = "http://fakespot.com/"
+
+/**
+ * Review Quality Check footer with an embedded link to navigate to Fakespot.com.
+ *
+ * @param onLinkClick Invoked when the user clicks on the embedded link.
+ */
+@Composable
+fun ReviewQualityCheckFooter(
+    onLinkClick: (String) -> Unit,
+) {
+    val poweredByLinkText = stringResource(
+        id = R.string.review_quality_check_powered_by_link,
+        stringResource(id = R.string.shopping_product_name),
+    )
+
+    LinkText(
+        text = stringResource(
+            id = R.string.review_quality_check_powered_by_2,
+            poweredByLinkText,
+        ),
+        linkTextState = LinkTextState(
+            text = poweredByLinkText,
+            url = FOOTER_LINK,
+            onClick = onLinkClick,
+        ),
+        style = FirefoxTheme.typography.body2.copy(
+            color = FirefoxTheme.colors.textPrimary,
+        ),
+        linkTextColor = FirefoxTheme.colors.textAccent,
+    )
+}
+
+@LightDarkPreview
+@Composable
+private fun ReviewQualityCheckFooterPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            ReviewQualityCheckFooter(
+                onLinkClick = {},
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckInfoCard.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckInfoCard.kt
new file mode 100644
index 000000000..5ef298d8f
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckInfoCard.kt
@@ -0,0 +1,238 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.LinkText
+import org.mozilla.fenix.compose.LinkTextState
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.compose.button.PrimaryButton
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * Review Quality Check Info Card UI.
+ *
+ * @param title The primary text of the info message.
+ * @param type The [ReviewQualityCheckInfoType] of message to display.
+ * @param modifier Modifier to be applied to the card.
+ * @param description The optional secondary piece of text.
+ * @param footer An optional piece of text with a clickable link.
+ * @param buttonText The text to show in the optional button.
+ */
+@Composable
+fun ReviewQualityCheckInfoCard(
+    title: String,
+    type: ReviewQualityCheckInfoType,
+    modifier: Modifier = Modifier,
+    description: String? = null,
+    footer: Pair<String, LinkTextState>? = null,
+    buttonText: InfoCardButtonText? = null,
+) {
+    ReviewQualityCheckCard(
+        modifier = modifier,
+        backgroundColor = type.cardBackgroundColor,
+        contentPadding = PaddingValues(
+            horizontal = 12.dp,
+            vertical = 8.dp,
+        ),
+        elevation = 0.dp,
+    ) {
+        Row {
+            when (type) {
+                ReviewQualityCheckInfoType.Warning -> {
+                    InfoCardIcon(iconId = R.drawable.mozac_ic_warning_fill_24)
+                }
+
+                ReviewQualityCheckInfoType.Confirmation -> {
+                    InfoCardIcon(iconId = R.drawable.mozac_ic_checkmark_24)
+                }
+
+                ReviewQualityCheckInfoType.Error,
+                ReviewQualityCheckInfoType.Info,
+                ReviewQualityCheckInfoType.AnalysisUpdate,
+                -> {
+                    InfoCardIcon(
+                        iconId = R.drawable.mozac_ic_information_fill_24,
+                        modifier = Modifier.size(24.dp),
+                    )
+                }
+
+                ReviewQualityCheckInfoType.Loading -> {
+                    IndeterminateProgressIndicator(modifier = Modifier.size(24.dp))
+                }
+            }
+
+            Spacer(modifier = Modifier.width(12.dp))
+
+            Column {
+                Text(
+                    text = title,
+                    color = FirefoxTheme.colors.textPrimary,
+                    style = FirefoxTheme.typography.headline8,
+                )
+
+                description?.let {
+                    Spacer(modifier = Modifier.height(4.dp))
+
+                    Text(
+                        text = description,
+                        color = FirefoxTheme.colors.textPrimary,
+                        style = FirefoxTheme.typography.body2,
+                    )
+                }
+
+                footer?.let {
+                    Spacer(modifier = Modifier.height(4.dp))
+
+                    LinkText(
+                        text = it.first,
+                        linkTextState = it.second,
+                        style = FirefoxTheme.typography.body2.copy(
+                            color = FirefoxTheme.colors.textPrimary,
+                        ),
+                        linkTextColor = FirefoxTheme.colors.textPrimary,
+                        linkTextDecoration = TextDecoration.Underline,
+                    )
+                }
+            }
+        }
+
+        buttonText?.let {
+            Spacer(modifier = Modifier.height(8.dp))
+
+            PrimaryButton(
+                text = it.text,
+                textColor = type.buttonTextColor,
+                backgroundColor = type.buttonBackgroundColor,
+                onClick = it.onClick,
+            )
+        }
+    }
+}
+
+@Composable
+private fun InfoCardIcon(
+    iconId: Int,
+    modifier: Modifier = Modifier,
+) {
+    Icon(
+        painter = painterResource(id = iconId),
+        contentDescription = null,
+        tint = FirefoxTheme.colors.iconPrimary,
+        modifier = modifier,
+    )
+}
+
+/**
+ * The possible types of a [ReviewQualityCheckInfoCard].
+ */
+enum class ReviewQualityCheckInfoType {
+
+    Warning,
+    Confirmation,
+    Error,
+    Info,
+    AnalysisUpdate,
+    Loading,
+    ;
+
+    val cardBackgroundColor: Color
+        @Composable
+        get() = when (this) {
+            Warning -> FirefoxTheme.colors.layerWarning
+            Confirmation -> FirefoxTheme.colors.layerConfirmation
+            Error -> FirefoxTheme.colors.layerError
+            Info -> FirefoxTheme.colors.layerInfo
+            AnalysisUpdate -> Color.Transparent
+            Loading -> Color.Transparent
+        }
+
+    val buttonBackgroundColor: Color
+        @Composable
+        get() = when (this) {
+            Warning -> FirefoxTheme.colors.actionWarning
+            Confirmation -> FirefoxTheme.colors.actionConfirmation
+            Error -> FirefoxTheme.colors.actionError
+            Info -> FirefoxTheme.colors.actionInfo
+            AnalysisUpdate -> FirefoxTheme.colors.actionSecondary
+            Loading -> FirefoxTheme.colors.actionSecondary
+        }
+
+    val buttonTextColor: Color
+        @Composable
+        get() = when {
+            this == Info && !isSystemInDarkTheme() -> FirefoxTheme.colors.textOnColorPrimary
+            this == AnalysisUpdate || this == Loading -> FirefoxTheme.colors.textActionSecondary
+            else -> FirefoxTheme.colors.textPrimary
+        }
+}
+
+/**
+ * Model for the optional button in a [ReviewQualityCheckInfoCard].
+ *
+ * @param text The text to show in the button.
+ * @param onClick The callback to invoke when the button is clicked.
+ */
+data class InfoCardButtonText(
+    val text: String,
+    val onClick: () -> Unit,
+)
+
+private class PreviewModelParameterProvider : PreviewParameterProvider<ReviewQualityCheckInfoType> {
+
+    override val values = enumValues<ReviewQualityCheckInfoType>().asSequence()
+}
+
+@LightDarkPreview
+@Composable
+private fun InfoCardPreview(
+    @PreviewParameter(PreviewModelParameterProvider::class) type: ReviewQualityCheckInfoType,
+) {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(16.dp),
+        ) {
+            ReviewQualityCheckInfoCard(
+                title = "Title text",
+                type = type,
+                modifier = Modifier.fillMaxWidth(),
+                description = "Description text",
+                footer = "Primary link text with an underlined hyperlink." to LinkTextState(
+                    text = "underlined hyperlink",
+                    url = "https://www.mozilla.org",
+                    onClick = {},
+                ),
+                buttonText = InfoCardButtonText(
+                    text = "Button text",
+                    onClick = {},
+                ),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckScaffold.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckScaffold.kt
index e0614923a..4d8399c87 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckScaffold.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckScaffold.kt
@@ -61,7 +61,7 @@ fun ReviewQualityCheckScaffold(
     ) {
         BottomSheetHandle(
             onRequestDismiss = onRequestDismiss,
-            contentDescription = stringResource(R.string.browser_menu_review_quality_check_close),
+            contentDescription = stringResource(R.string.review_quality_check_close_handle_content_description),
             modifier = Modifier
                 .fillMaxWidth(BOTTOM_SHEET_HANDLE_WIDTH_PERCENT)
                 .align(Alignment.CenterHorizontally),
@@ -94,7 +94,7 @@ private fun Header() {
         Spacer(modifier = Modifier.width(10.dp))
 
         Text(
-            text = stringResource(R.string.review_quality_check),
+            text = stringResource(R.string.review_quality_check_feature_name),
             color = FirefoxTheme.colors.textPrimary,
             style = FirefoxTheme.typography.headline6,
         )
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckSettingsCard.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckSettingsCard.kt
new file mode 100644
index 000000000..3ae841fc0
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckSettingsCard.kt
@@ -0,0 +1,119 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.SwitchWithLabel
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.compose.button.SecondaryButton
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * Review quality check settings card UI. Contains toggles to disable product recommendations and
+ * the entire review quality check feature.
+ *
+ * @param productRecommendationsEnabled The current state of the product recommendations toggle.
+ * @param onProductRecommendationsEnabledStateChange Invoked when the user changes the product
+ * recommendations toggle state.
+ * @param onTurnOffReviewQualityCheckClick Invoked when the user opts out of the review quality check feature.
+ * @param modifier Modifier to apply to the layout.
+ */
+@Composable
+fun ReviewQualityCheckSettingsCard(
+    productRecommendationsEnabled: Boolean?,
+    onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
+    onTurnOffReviewQualityCheckClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ReviewQualityCheckExpandableCard(
+        modifier = modifier,
+        title = stringResource(R.string.review_quality_check_settings_title),
+    ) {
+        SettingsContent(
+            productRecommendationsEnabled = productRecommendationsEnabled,
+            onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange,
+            onTurnOffReviewQualityCheckClick = onTurnOffReviewQualityCheckClick,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun SettingsContent(
+    productRecommendationsEnabled: Boolean?,
+    onProductRecommendationsEnabledStateChange: (Boolean) -> Unit,
+    onTurnOffReviewQualityCheckClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(modifier = modifier) {
+        Spacer(modifier = Modifier.height(8.dp))
+
+        if (productRecommendationsEnabled != null) {
+            SwitchWithLabel(
+                checked = productRecommendationsEnabled,
+                onCheckedChange = onProductRecommendationsEnabledStateChange,
+                label = stringResource(R.string.review_quality_check_settings_recommended_products),
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+        }
+
+        SecondaryButton(
+            text = stringResource(R.string.review_quality_check_settings_turn_off),
+            onClick = onTurnOffReviewQualityCheckClick,
+        )
+    }
+}
+
+@LightDarkPreview
+@Composable
+private fun ReviewQualityCheckSettingsCardPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            ReviewQualityCheckSettingsCard(
+                productRecommendationsEnabled = true,
+                onProductRecommendationsEnabledStateChange = {},
+                onTurnOffReviewQualityCheckClick = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
+
+@LightDarkPreview
+@Composable
+private fun SettingsContentPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            SettingsContent(
+                productRecommendationsEnabled = true,
+                onProductRecommendationsEnabledStateChange = {},
+                onTurnOffReviewQualityCheckClick = {},
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityInfoCard.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityInfoCard.kt
new file mode 100644
index 000000000..cdcda14b5
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityInfoCard.kt
@@ -0,0 +1,196 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.ClickableSubstringLink
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.compose.parseHtml
+import org.mozilla.fenix.settings.SupportUtils
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
+import org.mozilla.fenix.theme.FirefoxTheme
+
+/**
+ * Info card UI containing an explanation of the review quality.
+ *
+ * @param modifier Modifier to apply to the layout.
+ * @param onLearnMoreClick Invoked when the user clicks to learn more about review grades.
+ */
+@Composable
+fun ReviewQualityInfoCard(
+    modifier: Modifier = Modifier,
+    onLearnMoreClick: (String) -> Unit,
+) {
+    ReviewQualityCheckExpandableCard(
+        title = stringResource(id = R.string.review_quality_check_explanation_title),
+        modifier = modifier,
+    ) {
+        ReviewQualityInfo(
+            modifier = Modifier.fillMaxWidth(),
+            onLearnMoreClick = onLearnMoreClick,
+        )
+    }
+}
+
+@Suppress("Deprecation")
+@Composable
+private fun ReviewQualityInfo(
+    modifier: Modifier = Modifier,
+    onLearnMoreClick: (String) -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(24.dp),
+    ) {
+        val adjustedGradingText =
+            stringResource(id = R.string.review_quality_check_explanation_body_adjusted_grading)
+        // Any and all text formatting (bullets, inline substring bolding, etc.) will be handled as
+        // follow-up when the copy is finalized.
+        // Bug 1848219
+        Text(
+            text = stringResource(
+                id = R.string.review_quality_check_explanation_body_reliability,
+                stringResource(R.string.shopping_product_name),
+            ),
+            color = FirefoxTheme.colors.textPrimary,
+            style = FirefoxTheme.typography.body2,
+        )
+
+        val link = stringResource(
+            id = R.string.review_quality_check_info_learn_more_link,
+            stringResource(R.string.shopping_product_name),
+        )
+        val text = stringResource(R.string.review_quality_check_info_learn_more, link)
+        val context = LocalContext.current
+        val linkStartIndex = text.indexOf(link)
+        val linkEndIndex = linkStartIndex + link.length
+        ClickableSubstringLink(
+            text = text,
+            textStyle = FirefoxTheme.typography.body2,
+            clickableStartIndex = linkStartIndex,
+            clickableEndIndex = linkEndIndex,
+            onClick = {
+                onLearnMoreClick(
+                    // Placeholder Sumo page
+                    SupportUtils.getSumoURLForTopic(
+                        context,
+                        SupportUtils.SumoTopic.HELP,
+                    ),
+                )
+            },
+        )
+
+        ReviewGradingScaleInfo(
+            reviewGrades = listOf(
+                ReviewQualityCheckState.Grade.A,
+                ReviewQualityCheckState.Grade.B,
+            ),
+            info = stringResource(id = R.string.review_quality_check_info_grade_info_AB),
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        ReviewGradingScaleInfo(
+            reviewGrades = listOf(ReviewQualityCheckState.Grade.C),
+            info = stringResource(id = R.string.review_quality_check_info_grade_info_C),
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        ReviewGradingScaleInfo(
+            reviewGrades = listOf(
+                ReviewQualityCheckState.Grade.D,
+                ReviewQualityCheckState.Grade.F,
+            ),
+            info = stringResource(id = R.string.review_quality_check_info_grade_info_DF),
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        Text(
+            text = remember(adjustedGradingText) { parseHtml(adjustedGradingText) },
+            color = FirefoxTheme.colors.textPrimary,
+            style = FirefoxTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun ReviewGradingScaleInfo(
+    reviewGrades: List<ReviewQualityCheckState.Grade>,
+    info: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier.semantics(mergeDescendants = true) {},
+        verticalAlignment = Alignment.Top,
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        reviewGrades.forEach { grade ->
+            ReviewGradeCompact(grade = grade)
+        }
+
+        if (reviewGrades.size == 1) {
+            Spacer(modifier = Modifier.width(24.dp))
+        }
+
+        Text(
+            text = info,
+            color = FirefoxTheme.colors.textPrimary,
+            style = FirefoxTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+@LightDarkPreview
+private fun ReviewQualityInfoCardPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            ReviewQualityInfoCard(
+                modifier = Modifier.fillMaxWidth(),
+                onLearnMoreClick = {},
+            )
+        }
+    }
+}
+
+@Composable
+@LightDarkPreview
+private fun ReviewQualityInfoPreview() {
+    FirefoxTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = FirefoxTheme.colors.layer1)
+                .padding(all = 16.dp),
+        ) {
+            ReviewQualityInfo(
+                modifier = Modifier.fillMaxWidth(),
+                onLearnMoreClick = {},
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
index 780703f45..eeb5c06b3 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
@@ -21,6 +21,7 @@ class FloatingActionButtonBinding(
     store: TabsTrayStore,
     private val actionButton: ExtendedFloatingActionButton,
     private val interactor: TabsTrayFabInteractor,
+    private val isSignedIn: Boolean,
 ) : AbstractBinding<TabsTrayState>(store) {
 
     override suspend fun onState(flow: Flow<TabsTrayState>) {
@@ -62,20 +63,25 @@ class FloatingActionButtonBinding(
                 }
             }
             Page.SyncedTabs -> {
-                actionButton.apply {
-                    setText(
-                        when (syncing) {
-                            true -> R.string.sync_syncing_in_progress
-                            false -> R.string.tab_drawer_fab_sync
-                        },
-                    )
-                    contentDescription = context.getString(R.string.resync_button_content_description)
-                    extend()
-                    show()
-                    setIconResource(R.drawable.ic_fab_sync)
-                    setOnClickListener {
-                        interactor.onSyncedTabsFabClicked()
+                if (isSignedIn) {
+                    actionButton.apply {
+                        setText(
+                            when (syncing) {
+                                true -> R.string.sync_syncing_in_progress
+                                false -> R.string.tab_drawer_fab_sync
+                            },
+                        )
+                        contentDescription =
+                            context.getString(R.string.resync_button_content_description)
+                        extend()
+                        show()
+                        setIconResource(R.drawable.ic_fab_sync)
+                        setOnClickListener {
+                            interactor.onSyncedTabsFabClicked()
+                        }
                     }
+                } else {
+                    actionButton.hide()
                 }
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
index f084a6a98..79f3dded0 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTray.kt
@@ -94,7 +94,9 @@ import mozilla.components.browser.storage.sync.Tab as SyncTab
  * @param onTabAutoCloseBannerViewOptionsClick Invoked when the user clicks to view the auto close options.
  * @param onTabAutoCloseBannerDismiss Invoked when the user clicks to dismiss the auto close banner.
  * @param onTabAutoCloseBannerShown Invoked when the auto close banner has been shown to the user.
+ * @param onMove Invoked after the drag and drop gesture completed. Swaps positions of two tabs.
  */
+@OptIn(ExperimentalFoundationApi::class)
 @Suppress("LongMethod", "LongParameterList", "ComplexMethod")
 @Composable
 fun TabsTray(
@@ -133,12 +135,14 @@ fun TabsTray(
     onTabAutoCloseBannerViewOptionsClick: () -> Unit,
     onTabAutoCloseBannerDismiss: () -> Unit,
     onTabAutoCloseBannerShown: () -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
 ) {
     val multiselectMode = tabsTrayStore
         .observeAsComposableState { state -> state.mode }.value ?: TabsTrayState.Mode.Normal
     val selectedPage = tabsTrayStore
         .observeAsComposableState { state -> state.selectedPage }.value ?: Page.NormalTabs
-    val pagerState = rememberPagerState(initialPage = selectedPage.ordinal)
+    val pagerState =
+        rememberPagerState(initialPage = selectedPage.ordinal, pageCount = { Page.values().size })
     val isInMultiSelectMode = multiselectMode is TabsTrayState.Mode.Select
 
     val shapeModifier = if (isInMultiSelectMode) {
@@ -185,7 +189,6 @@ fun TabsTray(
 
         Box(modifier = Modifier.fillMaxSize()) {
             HorizontalPager(
-                pageCount = Page.values().size,
                 modifier = Modifier.fillMaxSize(),
                 state = pagerState,
                 beyondBoundsPageCount = 2,
@@ -211,6 +214,7 @@ fun TabsTray(
                             onEnableInactiveTabAutoCloseClick = onEnableInactiveTabAutoCloseClick,
                             onInactiveTabClick = onInactiveTabClick,
                             onInactiveTabClose = onInactiveTabClose,
+                            onMove = onMove,
                         )
                     }
 
@@ -224,6 +228,7 @@ fun TabsTray(
                             onTabMediaClick = onTabMediaClick,
                             onTabClick = onTabClick,
                             onTabLongClick = onTabLongClick,
+                            onMove = onMove,
                         )
                     }
 
@@ -259,6 +264,7 @@ private fun NormalTabsPage(
     onEnableInactiveTabAutoCloseClick: () -> Unit,
     onInactiveTabClick: (TabSessionState) -> Unit,
     onInactiveTabClose: (TabSessionState) -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
 ) {
     val inactiveTabsExpanded = appStore
         .observeAsComposableState { state -> state.inactiveTabsExpanded }.value ?: false
@@ -316,6 +322,8 @@ private fun NormalTabsPage(
             onTabClick = onTabClick,
             onTabLongClick = onTabLongClick,
             header = optionalInactiveTabsHeader,
+            onTabDragStart = { tabsTrayStore.dispatch(TabsTrayAction.ExitSelectMode) },
+            onMove = onMove,
         )
     } else {
         EmptyTabPage(isPrivate = false)
@@ -333,6 +341,7 @@ private fun PrivateTabsPage(
     onTabMediaClick: (TabSessionState) -> Unit,
     onTabClick: (TabSessionState) -> Unit,
     onTabLongClick: (TabSessionState) -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
 ) {
     val selectedTabId = browserStore
         .observeAsComposableState { state -> state.selectedTabId }.value
@@ -353,6 +362,11 @@ private fun PrivateTabsPage(
             onTabMediaClick = onTabMediaClick,
             onTabClick = onTabClick,
             onTabLongClick = onTabLongClick,
+            onTabDragStart = {
+                // Because we don't currently support selection mode for private tabs,
+                // there's no need to exit selection mode when dragging tabs.
+            },
+            onMove = onMove,
         )
     } else {
         EmptyTabPage(isPrivate = true)
@@ -369,7 +383,6 @@ private fun SyncedTabsPage(
 
     SyncedTabsList(
         syncedTabs = syncedTabs,
-        taskContinuityEnabled = true,
         onTabClick = onTabClick,
     )
 }
@@ -577,6 +590,7 @@ private fun TabsTrayPreviewRoot(
             onTabAutoCloseBannerViewOptionsClick = {},
             onTabAutoCloseBannerDismiss = {},
             onTabAutoCloseBannerShown = {},
+            onMove = { _, _, _ -> },
         )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
index 00fe9481f..23bc81ecf 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt
@@ -34,6 +34,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.dimensionResource
@@ -56,6 +57,7 @@ import org.mozilla.fenix.compose.ContextualMenu
 import org.mozilla.fenix.compose.Divider
 import org.mozilla.fenix.compose.MenuItem
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
+import org.mozilla.fenix.tabstray.ext.getMenuItems
 import org.mozilla.fenix.theme.FirefoxTheme
 import kotlin.math.max
 
@@ -123,30 +125,39 @@ fun TabsTrayBanner(
     }.value ?: false
     var hasAcknowledgedBanner by remember { mutableStateOf(false) }
 
+    val menuItems = multiselectMode.getMenuItems(
+        resources = LocalContext.current.resources,
+        shouldShowInactiveButton = isInDebugMode,
+        onBookmarkSelectedTabsClick = onBookmarkSelectedTabsClick,
+        onCloseSelectedTabsClick = onDeleteSelectedTabsClick,
+        onMakeSelectedTabsInactive = onForceSelectedTabsAsInactiveClick,
+
+        selectedPage = selectedPage,
+        normalTabCount = normalTabCount,
+        privateTabCount = privateTabCount,
+        onTabSettingsClick = onTabSettingsClick,
+        onRecentlyClosedClick = onRecentlyClosedClick,
+        onEnterMultiselectModeClick = { tabsTrayStore.dispatch(TabsTrayAction.EnterSelectMode) },
+        onShareAllTabsClick = onShareAllTabsClick,
+        onDeleteAllTabsClick = onDeleteAllTabsClick,
+        onAccountSettingsClick = onAccountSettingsClick,
+    )
+
     Column {
         if (multiselectMode is TabsTrayState.Mode.Select) {
             MultiSelectBanner(
+                menuItems = menuItems,
                 selectedTabCount = multiselectMode.selectedTabs.size,
-                shouldShowInactiveButton = isInDebugMode,
                 onExitSelectModeClick = { tabsTrayStore.dispatch(TabsTrayAction.ExitSelectMode) },
                 onSaveToCollectionsClick = onSaveToCollectionClick,
                 onShareSelectedTabs = onShareSelectedTabsClick,
-                onBookmarkSelectedTabsClick = onBookmarkSelectedTabsClick,
-                onCloseSelectedTabsClick = onDeleteSelectedTabsClick,
-                onMakeSelectedTabsInactive = onForceSelectedTabsAsInactiveClick,
             )
         } else {
             SingleSelectBanner(
-                onTabPageIndicatorClicked = onTabPageIndicatorClicked,
+                menuItems = menuItems,
                 selectedPage = selectedPage,
                 normalTabCount = normalTabCount,
-                privateTabCount = privateTabCount,
-                onEnterMultiselectModeClick = { tabsTrayStore.dispatch(TabsTrayAction.EnterSelectMode) },
-                onShareAllTabsClick = onShareAllTabsClick,
-                onTabSettingsClick = onTabSettingsClick,
-                onRecentlyClosedClick = onRecentlyClosedClick,
-                onAccountSettingsClick = onAccountSettingsClick,
-                onDeleteAllTabsClick = onDeleteAllTabsClick,
+                onTabPageIndicatorClicked = onTabPageIndicatorClicked,
                 onDismissClick = onDismissClick,
             )
         }
@@ -176,16 +187,10 @@ fun TabsTrayBanner(
 @Suppress("LongMethod", "LongParameterList")
 @Composable
 private fun SingleSelectBanner(
+    menuItems: List<MenuItem>,
     selectedPage: Page,
     normalTabCount: Int,
-    privateTabCount: Int,
     onTabPageIndicatorClicked: (Page) -> Unit,
-    onEnterMultiselectModeClick: () -> Unit,
-    onShareAllTabsClick: () -> Unit,
-    onTabSettingsClick: () -> Unit,
-    onRecentlyClosedClick: () -> Unit,
-    onAccountSettingsClick: () -> Unit,
-    onDeleteAllTabsClick: () -> Unit,
     onDismissClick: () -> Unit,
 ) {
     val selectedColor = FirefoxTheme.colors.iconActive
@@ -273,17 +278,7 @@ private fun SingleSelectBanner(
                     .testTag(TabsTrayTestTag.threeDotButton),
             ) {
                 ContextualMenu(
-                    menuItems = generateSingleSelectBannerMenuItems(
-                        selectedPage,
-                        normalTabCount,
-                        privateTabCount,
-                        onTabSettingsClick,
-                        onRecentlyClosedClick,
-                        onEnterMultiselectModeClick,
-                        onShareAllTabsClick,
-                        onDeleteAllTabsClick,
-                        onAccountSettingsClick,
-                    ),
+                    menuItems = menuItems,
                     showMenu = showMenu,
                     offset = DpOffset(x = 0.dp, y = -ICON_SIZE),
                     onDismissRequest = { showMenu = false },
@@ -298,79 +293,6 @@ private fun SingleSelectBanner(
     }
 }
 
-@Suppress("LongParameterList")
-@Composable
-private fun generateSingleSelectBannerMenuItems(
-    selectedPage: Page,
-    normalTabCount: Int,
-    privateTabCount: Int,
-    onTabSettingsClick: () -> Unit,
-    onRecentlyClosedClick: () -> Unit,
-    onEnterMultiselectModeClick: () -> Unit,
-    onShareAllTabsClick: () -> Unit,
-    onDeleteAllTabsClick: () -> Unit,
-    onAccountSettingsClick: () -> Unit,
-): List<MenuItem> {
-    val tabSettingsItem = MenuItem(
-        title = stringResource(id = R.string.tab_tray_menu_tab_settings),
-        testTag = TabsTrayTestTag.tabSettings,
-        onClick = onTabSettingsClick,
-    )
-    val recentlyClosedTabsItem = MenuItem(
-        title = stringResource(id = R.string.tab_tray_menu_recently_closed),
-        testTag = TabsTrayTestTag.recentlyClosedTabs,
-        onClick = onRecentlyClosedClick,
-    )
-    val enterSelectModeItem = MenuItem(
-        title = stringResource(id = R.string.tabs_tray_select_tabs),
-        testTag = TabsTrayTestTag.selectTabs,
-        onClick = onEnterMultiselectModeClick,
-    )
-    val shareAllTabsItem = MenuItem(
-        title = stringResource(id = R.string.tab_tray_menu_item_share),
-        testTag = TabsTrayTestTag.shareAllTabs,
-        onClick = onShareAllTabsClick,
-    )
-    val deleteAllTabsItem = MenuItem(
-        title = stringResource(id = R.string.tab_tray_menu_item_close),
-        testTag = TabsTrayTestTag.closeAllTabs,
-        onClick = onDeleteAllTabsClick,
-    )
-    val accountSettingsItem = MenuItem(
-        title = stringResource(id = R.string.tab_tray_menu_account_settings),
-        testTag = TabsTrayTestTag.accountSettings,
-        onClick = onAccountSettingsClick,
-    )
-    return when {
-        selectedPage == Page.NormalTabs && normalTabCount == 0 ||
-            selectedPage == Page.PrivateTabs && privateTabCount == 0 -> listOf(
-            tabSettingsItem,
-            recentlyClosedTabsItem,
-        )
-
-        selectedPage == Page.NormalTabs -> listOf(
-            enterSelectModeItem,
-            shareAllTabsItem,
-            tabSettingsItem,
-            recentlyClosedTabsItem,
-            deleteAllTabsItem,
-        )
-
-        selectedPage == Page.PrivateTabs -> listOf(
-            tabSettingsItem,
-            recentlyClosedTabsItem,
-            deleteAllTabsItem,
-        )
-
-        selectedPage == Page.SyncedTabs -> listOf(
-            accountSettingsItem,
-            recentlyClosedTabsItem,
-        )
-
-        else -> emptyList()
-    }
-}
-
 private const val MAX_VISIBLE_TABS = 99
 private const val SO_MANY_TABS_OPEN = "∞"
 private val NORMAL_TABS_BOTTOM_PADDING = 0.5.dp
@@ -453,46 +375,22 @@ private fun NormalTabsTabIcon(normalTabCount: Int) {
 /**
  * Banner displayed in multi select mode.
  *
+ * @param menuItems List of items in the menu.
  * @param selectedTabCount Number of selected tabs.
- * @param shouldShowInactiveButton Whether or not to show the inactive tabs menu item.
  * @param onExitSelectModeClick Invoked when the user clicks on exit select mode button.
  * @param onSaveToCollectionsClick Invoked when the user clicks on the save to collection button.
  * @param onShareSelectedTabs Invoked when the user clicks on the share button.
- * @param onBookmarkSelectedTabsClick Invoked when user interacts with the bookmark menu item.
- * @param onCloseSelectedTabsClick Invoked when user interacts with the close menu item.
- * @param onMakeSelectedTabsInactive Invoked when user interacts with the make inactive menu item.
  */
 @Suppress("LongMethod", "LongParameterList")
 @Composable
 private fun MultiSelectBanner(
+    menuItems: List<MenuItem>,
     selectedTabCount: Int,
-    shouldShowInactiveButton: Boolean,
     onExitSelectModeClick: () -> Unit,
     onSaveToCollectionsClick: () -> Unit,
     onShareSelectedTabs: () -> Unit,
-    onBookmarkSelectedTabsClick: () -> Unit,
-    onCloseSelectedTabsClick: () -> Unit,
-    onMakeSelectedTabsInactive: () -> Unit,
 ) {
     var showMenu by remember { mutableStateOf(false) }
-    val menuItems = mutableListOf(
-        MenuItem(
-            title = stringResource(R.string.tab_tray_multiselect_menu_item_bookmark),
-            onClick = onBookmarkSelectedTabsClick,
-        ),
-        MenuItem(
-            title = stringResource(R.string.tab_tray_multiselect_menu_item_close),
-            onClick = onCloseSelectedTabsClick,
-        ),
-    )
-    if (shouldShowInactiveButton) {
-        menuItems.add(
-            MenuItem(
-                title = stringResource(R.string.inactive_tabs_menu_item),
-                onClick = onMakeSelectedTabsInactive,
-            ),
-        )
-    }
 
     Row(
         modifier = Modifier
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt
index 72af1abae..7774ba002 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt
@@ -22,6 +22,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
  * Floating action button for tabs tray.
  *
  * @param tabsTrayStore [TabsTrayStore] used to listen for changes to [TabsTrayState].
+ * @param isSignedIn Used to know when to show the SYNC FAB when [Page.SyncedTabs] is displayed.
  * @param onNormalTabsFabClicked Invoked when the fab is clicked in [Page.NormalTabs].
  * @param onPrivateTabsFabClicked Invoked when the fab is clicked in [Page.PrivateTabs].
  * @param onSyncedTabsFabClicked Invoked when the fab is clicked in [Page.SyncedTabs].
@@ -29,6 +30,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
 @Composable
 fun TabsTrayFab(
     tabsTrayStore: TabsTrayStore,
+    isSignedIn: Boolean,
     onNormalTabsFabClicked: () -> Unit,
     onPrivateTabsFabClicked: () -> Unit,
     onSyncedTabsFabClicked: () -> Unit,
@@ -75,7 +77,7 @@ fun TabsTrayFab(
         }
     }
 
-    if (isInNormalMode) {
+    if (isInNormalMode && !(currentPage == Page.SyncedTabs && !isSignedIn)) {
         FloatingActionButton(
             icon = icon,
             modifier = Modifier
@@ -99,7 +101,13 @@ private fun TabsTraySyncFabPreview() {
     )
 
     FirefoxTheme {
-        TabsTrayFab(store, {}, {}, {})
+        TabsTrayFab(
+            tabsTrayStore = store,
+            isSignedIn = true,
+            onNormalTabsFabClicked = {},
+            onPrivateTabsFabClicked = {},
+            onSyncedTabsFabClicked = {},
+        )
     }
 }
 
@@ -112,6 +120,12 @@ private fun TabsTrayPrivateFabPreview() {
         ),
     )
     FirefoxTheme {
-        TabsTrayFab(store, {}, {}, {})
+        TabsTrayFab(
+            tabsTrayStore = store,
+            isSignedIn = true,
+            onNormalTabsFabClicked = {},
+            onPrivateTabsFabClicked = {},
+            onSyncedTabsFabClicked = {},
+        )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
index b21a2f462..876f6b850 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
@@ -304,6 +304,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
                         onTabAutoCloseBannerShown = {
                             requireContext().settings().lastCfrShownTimeInMillis = System.currentTimeMillis()
                         },
+                        onMove = tabsTrayInteractor::onTabsMove,
                     )
                 }
             }
@@ -312,6 +313,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
                 FirefoxTheme(theme = Theme.getTheme(allowPrivateTheme = false)) {
                     TabsTrayFab(
                         tabsTrayStore = tabsTrayStore,
+                        isSignedIn = requireContext().settings().signedInFxaAccount,
                         onNormalTabsFabClicked = tabsTrayInteractor::onNormalTabsFabClicked,
                         onPrivateTabsFabClicked = tabsTrayInteractor::onPrivateTabsFabClicked,
                         onSyncedTabsFabClicked = tabsTrayInteractor::onSyncedTabsFabClicked,
@@ -462,6 +464,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
                     store = tabsTrayStore,
                     actionButton = fabButtonBinding.newTabButton,
                     interactor = tabsTrayInteractor,
+                    isSignedIn = requireContext().settings().signedInFxaAccount,
                 ),
                 owner = this,
                 view = view,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
index 8276b8b4f..3b72af512 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayTabLayouts.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.tabstray
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
@@ -13,12 +14,16 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -31,10 +36,21 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.compose.tabstray.TabGridItem
 import org.mozilla.fenix.compose.tabstray.TabListItem
+import org.mozilla.fenix.tabstray.browser.compose.DragItemContainer
+import org.mozilla.fenix.tabstray.browser.compose.createGridReorderState
+import org.mozilla.fenix.tabstray.browser.compose.createListReorderState
+import org.mozilla.fenix.tabstray.browser.compose.detectGridPressAndDragGestures
+import org.mozilla.fenix.tabstray.browser.compose.detectVerticalPressAndDrag
 import org.mozilla.fenix.tabstray.ext.MIN_COLUMN_WIDTH_DP
 import org.mozilla.fenix.theme.FirefoxTheme
 import kotlin.math.max
 
+// Key for the span item at the bottom of the tray, used to make the item not reorderable.
+const val SPAN_ITEM_KEY = "span"
+
+// Key for the header item at the top of the tray, used to make the item not reorderable.
+const val HEADER_ITEM_KEY = "header"
+
 /**
  * Top-level UI for displaying a list of tabs.
  *
@@ -49,6 +65,8 @@ import kotlin.math.max
  * @param onTabMediaClick Invoked when the user interacts with a tab's media controls.
  * @param onTabClick Invoked when the user clicks on a tab.
  * @param onTabLongClick Invoked when the user long clicks a tab.
+ * @param onMove Invoked when the user moves a tab.
+ * @param onTabDragStart Invoked when starting to drag a tab.
  * @param header Optional layout to display before [tabs].
  */
 @Suppress("LongParameterList")
@@ -64,6 +82,8 @@ fun TabLayout(
     onTabMediaClick: (TabSessionState) -> Unit,
     onTabClick: (TabSessionState) -> Unit,
     onTabLongClick: (TabSessionState) -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
+    onTabDragStart: () -> Unit,
     header: (@Composable () -> Unit)? = null,
 ) {
     var selectedTabIndex = 0
@@ -87,6 +107,8 @@ fun TabLayout(
             onTabMediaClick = onTabMediaClick,
             onTabClick = onTabClick,
             onTabLongClick = onTabLongClick,
+            onMove = onMove,
+            onTabDragStart = onTabDragStart,
             header = header,
         )
     } else {
@@ -101,12 +123,15 @@ fun TabLayout(
             onTabMediaClick = onTabMediaClick,
             onTabClick = onTabClick,
             onTabLongClick = onTabLongClick,
+            onMove = onMove,
+            onTabDragStart = onTabDragStart,
             header = header,
         )
     }
 }
 
-@Suppress("LongParameterList")
+@OptIn(ExperimentalFoundationApi::class)
+@Suppress("LongParameterList", "LongMethod")
 @Composable
 private fun TabGrid(
     tabs: List<TabSessionState>,
@@ -119,6 +144,8 @@ private fun TabGrid(
     onTabMediaClick: (TabSessionState) -> Unit,
     onTabClick: (TabSessionState) -> Unit,
     onTabLongClick: (TabSessionState) -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
+    onTabDragStart: () -> Unit,
     header: (@Composable () -> Unit)? = null,
 ) {
     val state = rememberLazyGridState(initialFirstVisibleItemIndex = selectedTabIndex)
@@ -129,41 +156,78 @@ private fun TabGrid(
     )
     val isInMultiSelectMode = selectionMode is TabsTrayState.Mode.Select
 
+    val reorderState = createGridReorderState(
+        gridState = state,
+        onMove = { initialTab, newTab ->
+            onMove(
+                (initialTab.key as String),
+                (newTab.key as String),
+                initialTab.index < newTab.index,
+            )
+        },
+        onLongPress = { itemInfo ->
+            tabs.firstOrNull { tab -> tab.id == itemInfo.key }?.let { tab ->
+                onTabLongClick(tab)
+            }
+        },
+        onExitLongPress = onTabDragStart,
+        ignoredItems = listOf(HEADER_ITEM_KEY, SPAN_ITEM_KEY),
+    )
+    var shouldLongPress by remember { mutableStateOf(!isInMultiSelectMode) }
+    LaunchedEffect(selectionMode, reorderState.draggingItemKey) {
+        if (reorderState.draggingItemKey == null) {
+            shouldLongPress = selectionMode == TabsTrayState.Mode.Normal
+        }
+    }
+
     LazyVerticalGrid(
         columns = GridCells.Adaptive(minSize = MIN_COLUMN_WIDTH_DP.dp),
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .detectGridPressAndDragGestures(
+                gridState = state,
+                reorderState = reorderState,
+                shouldLongPressToDrag = shouldLongPress,
+            ),
         state = state,
     ) {
         header?.let {
-            item(span = { GridItemSpan(maxLineSpan) }) {
+            item(key = HEADER_ITEM_KEY, span = { GridItemSpan(maxLineSpan) }) {
                 header()
             }
         }
 
-        items(
+        itemsIndexed(
             items = tabs,
-            key = { tab -> tab.id },
-        ) { tab ->
-            TabGridItem(
-                tab = tab,
-                thumbnailSize = tabThumbnailSize,
-                storage = storage,
-                isSelected = tab.id == selectedTabId,
-                multiSelectionEnabled = isInMultiSelectMode,
-                multiSelectionSelected = selectionMode.selectedTabs.contains(tab),
-                onCloseClick = onTabClose,
-                onMediaClick = onTabMediaClick,
-                onClick = onTabClick,
-                onLongClick = onTabLongClick,
-            )
+            key = { _, tab -> tab.id },
+        ) { index, tab ->
+            DragItemContainer(
+                state = reorderState,
+                position = index + if (header != null) 1 else 0,
+                key = tab.id,
+            ) {
+                TabGridItem(
+                    tab = tab,
+                    thumbnailSize = tabThumbnailSize,
+                    storage = storage,
+                    isSelected = tab.id == selectedTabId,
+                    multiSelectionEnabled = isInMultiSelectMode,
+                    multiSelectionSelected = selectionMode.selectedTabs.contains(tab),
+                    shouldClickListen = reorderState.draggingItemKey != tab.id,
+                    onCloseClick = onTabClose,
+                    onMediaClick = onTabMediaClick,
+                    onClick = onTabClick,
+                )
+            }
         }
 
-        item(span = { GridItemSpan(maxLineSpan) }) {
+        item(key = SPAN_ITEM_KEY, span = { GridItemSpan(maxLineSpan) }) {
             Spacer(modifier = Modifier.height(tabListBottomPadding))
         }
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Suppress("LongParameterList")
 @Composable
 private fun TabList(
@@ -177,7 +241,9 @@ private fun TabList(
     onTabMediaClick: (TabSessionState) -> Unit,
     onTabClick: (TabSessionState) -> Unit,
     onTabLongClick: (TabSessionState) -> Unit,
+    onMove: (String, String?, Boolean) -> Unit,
     header: (@Composable () -> Unit)? = null,
+    onTabDragStart: () -> Unit = {},
 ) {
     val state = rememberLazyListState(initialFirstVisibleItemIndex = selectedTabIndex)
     val tabListBottomPadding = dimensionResource(id = R.dimen.tab_tray_list_bottom_padding)
@@ -186,36 +252,71 @@ private fun TabList(
         LocalContext.current.resources.getDimensionPixelSize(R.dimen.tab_tray_list_item_thumbnail_width),
     )
     val isInMultiSelectMode = selectionMode is TabsTrayState.Mode.Select
+    val reorderState = createListReorderState(
+        listState = state,
+        onMove = { initialTab, newTab ->
+            onMove(
+                (initialTab.key as String),
+                (newTab.key as String),
+                initialTab.index < newTab.index,
+            )
+        },
+        onLongPress = {
+            tabs.firstOrNull { tab -> tab.id == it.key }?.let { tab ->
+                onTabLongClick(tab)
+            }
+        },
+        onExitLongPress = onTabDragStart,
+        ignoredItems = listOf(HEADER_ITEM_KEY, SPAN_ITEM_KEY),
+    )
+    var shouldLongPress by remember { mutableStateOf(!isInMultiSelectMode) }
+    LaunchedEffect(selectionMode, reorderState.draggingItemKey) {
+        if (reorderState.draggingItemKey == null) {
+            shouldLongPress = selectionMode == TabsTrayState.Mode.Normal
+        }
+    }
 
     LazyColumn(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .detectVerticalPressAndDrag(
+                listState = state,
+                reorderState = reorderState,
+                shouldLongPressToDrag = shouldLongPress,
+            ),
         state = state,
     ) {
         header?.let {
-            item {
+            item(key = HEADER_ITEM_KEY) {
                 header()
             }
         }
 
-        items(
+        itemsIndexed(
             items = tabs,
-            key = { tab -> tab.id },
-        ) { tab ->
-            TabListItem(
-                tab = tab,
-                thumbnailSize = tabThumbnailSize,
-                storage = storage,
-                isSelected = tab.id == selectedTabId,
-                multiSelectionEnabled = isInMultiSelectMode,
-                multiSelectionSelected = selectionMode.selectedTabs.contains(tab),
-                onCloseClick = onTabClose,
-                onMediaClick = onTabMediaClick,
-                onClick = onTabClick,
-                onLongClick = onTabLongClick,
-            )
+            key = { _, tab -> tab.id },
+        ) { index, tab ->
+            DragItemContainer(
+                state = reorderState,
+                position = index + if (header != null) 1 else 0,
+                key = tab.id,
+            ) {
+                TabListItem(
+                    tab = tab,
+                    thumbnailSize = tabThumbnailSize,
+                    storage = storage,
+                    isSelected = tab.id == selectedTabId,
+                    multiSelectionEnabled = isInMultiSelectMode,
+                    multiSelectionSelected = selectionMode.selectedTabs.contains(tab),
+                    shouldClickListen = reorderState.draggingItemKey != tab.id,
+                    onCloseClick = onTabClose,
+                    onMediaClick = onTabMediaClick,
+                    onClick = onTabClick,
+                )
+            }
         }
 
-        item {
+        item(key = SPAN_ITEM_KEY) {
             Spacer(modifier = Modifier.height(tabListBottomPadding))
         }
     }
@@ -242,6 +343,8 @@ private fun TabListPreview() {
                 onTabMediaClick = {},
                 onTabClick = {},
                 onTabLongClick = {},
+                onTabDragStart = {},
+                onMove = { _, _, _ -> },
             )
         }
     }
@@ -268,6 +371,8 @@ private fun TabGridPreview() {
                 onTabMediaClick = {},
                 onTabClick = {},
                 onTabLongClick = {},
+                onTabDragStart = {},
+                onMove = { _, _, _ -> },
             )
         }
     }
@@ -302,12 +407,17 @@ private fun TabGridMultiSelectPreview() {
                     }
                 },
                 onTabLongClick = {},
+                onTabDragStart = {},
+                onMove = { _, _, _ -> },
             )
         }
     }
 }
 
-private fun generateFakeTabsList(tabCount: Int = 10, isPrivate: Boolean = false): List<TabSessionState> =
+private fun generateFakeTabsList(
+    tabCount: Int = 10,
+    isPrivate: Boolean = false,
+): List<TabSessionState> =
     List(tabCount) { index ->
         TabSessionState(
             id = "tabId$index-$isPrivate",
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
index 7459e3ab5..f78767325 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
@@ -111,7 +111,7 @@ abstract class AbstractBrowserTabViewHolder(
             }
         }
 
-        loadIntoThumbnailView(thumbnailView, tab.id)
+        loadIntoThumbnailView(thumbnailView, tab.id, tab.content.private)
     }
 
     override fun showTabIsMultiSelectEnabled(selectedMaskView: View?, isSelected: Boolean) {
@@ -201,8 +201,8 @@ abstract class AbstractBrowserTabViewHolder(
         }
     }
 
-    private fun loadIntoThumbnailView(thumbnailView: ImageView, id: String) {
-        imageLoader.loadIntoView(thumbnailView, ImageLoadRequest(id, thumbnailSize))
+    private fun loadIntoThumbnailView(thumbnailView: ImageView, id: String, isPrivate: Boolean) {
+        imageLoader.loadIntoView(thumbnailView, ImageLoadRequest(id, thumbnailSize, isPrivate))
     }
 
     private fun setSelectionInteractor(
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeGridViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeGridViewHolder.kt
index 9592dfd59..49d28f597 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeGridViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeGridViewHolder.kt
@@ -69,10 +69,6 @@ class ComposeGridViewHolder(
         interactor.onTabSelected(tab, featureName)
     }
 
-    private fun onLongClick(tab: TabSessionState) {
-        interactor.onTabLongClicked(tab)
-    }
-
     @Composable
     override fun Content(tab: TabSessionState) {
         val multiSelectionEnabled = store.observeAsComposableState { state ->
@@ -91,7 +87,6 @@ class ComposeGridViewHolder(
             onCloseClick = ::onCloseClicked,
             onMediaClick = interactor::onMediaClicked,
             onClick = ::onClick,
-            onLongClick = ::onLongClick,
         )
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeListViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeListViewHolder.kt
index 40c42ffb3..acfe9e1b3 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeListViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ComposeListViewHolder.kt
@@ -72,10 +72,6 @@ class ComposeListViewHolder(
         interactor.onTabSelected(tab, featureName)
     }
 
-    private fun onLongClick(tab: TabSessionState) {
-        interactor.onTabLongClicked(tab)
-    }
-
     @Composable
     override fun Content(tab: TabSessionState) {
         val multiSelectionEnabled = tabsTrayStore.observeAsComposableState {
@@ -95,7 +91,6 @@ class ComposeListViewHolder(
             onCloseClick = ::onCloseClicked,
             onMediaClick = interactor::onMediaClicked,
             onClick = ::onClick,
-            onLongClick = ::onLongClick,
         )
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableGrid.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableGrid.kt
new file mode 100644
index 000000000..45a809b1c
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableGrid.kt
@@ -0,0 +1,302 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabstray.browser.compose
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.VectorConverter
+import androidx.compose.animation.core.VisibilityThreshold
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.lazy.grid.LazyGridItemInfo
+import androidx.compose.foundation.lazy.grid.LazyGridItemScope
+import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.hapticfeedback.HapticFeedback
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.toOffset
+import androidx.compose.ui.unit.toSize
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * Remember the reordering state for reordering grid items.
+ *
+ * @param gridState State of the grid.
+ * @param onMove Callback to be invoked when switching between two items.
+ * @param ignoredItems List of keys for non-draggable items.
+ * @param onLongPress Optional callback to be invoked when long pressing an item.
+ * @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
+ */
+@Composable
+fun createGridReorderState(
+    gridState: LazyGridState,
+    onMove: (LazyGridItemInfo, LazyGridItemInfo) -> Unit,
+    ignoredItems: List<Any>,
+    onLongPress: (LazyGridItemInfo) -> Unit = {},
+    onExitLongPress: () -> Unit = {},
+): GridReorderState {
+    val scope = rememberCoroutineScope()
+    val touchSlop = LocalViewConfiguration.current.touchSlop
+    val hapticFeedback = LocalHapticFeedback.current
+    val state = remember(gridState) {
+        GridReorderState(
+            gridState = gridState,
+            onMove = onMove,
+            scope = scope,
+            touchSlop = touchSlop,
+            ignoredItems = ignoredItems,
+            onLongPress = onLongPress,
+            hapticFeedback = hapticFeedback,
+            onExitLongPress = onExitLongPress,
+        )
+    }
+    return state
+}
+
+/**
+ * Class containing details about the current state of dragging in grid.
+ *
+ * @param gridState State of the grid.
+ * @param scope [CoroutineScope] used for scrolling to the target item.
+ * @param hapticFeedback [HapticFeedback] used for performing haptic feedback on item long press.
+ * @param touchSlop Distance in pixels the user can wander until we consider they started dragging.
+ * @param onMove Callback to be invoked when switching between two items.
+ * @param onLongPress Optional callback to be invoked when long pressing an item.
+ * @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
+ * @param ignoredItems List of keys for non-draggable items.
+ */
+class GridReorderState internal constructor(
+    private val gridState: LazyGridState,
+    private val scope: CoroutineScope,
+    private val hapticFeedback: HapticFeedback,
+    private val touchSlop: Float,
+    private val onMove: (LazyGridItemInfo, LazyGridItemInfo) -> Unit,
+    private val onLongPress: (LazyGridItemInfo) -> Unit = {},
+    private val onExitLongPress: () -> Unit = {},
+    private val ignoredItems: List<Any> = emptyList(),
+) {
+    internal var draggingItemKey by mutableStateOf<Any?>(null)
+        private set
+
+    private var draggingItemCumulatedOffset by mutableStateOf(Offset.Zero)
+    private var draggingItemInitialOffset by mutableStateOf(Offset.Zero)
+    internal var moved by mutableStateOf(false)
+    private val draggingItemOffset: Offset
+        get() = draggingItemLayoutInfo?.let { item ->
+            draggingItemInitialOffset + draggingItemCumulatedOffset - item.offset.toOffset()
+        } ?: Offset.Zero
+
+    internal fun computeItemOffset(index: Int): Offset {
+        val itemAtIndex = gridState.layoutInfo.visibleItemsInfo.firstOrNull { info -> info.index == index }
+            ?: return Offset.Zero
+        return draggingItemInitialOffset + draggingItemCumulatedOffset - itemAtIndex.offset.toOffset()
+    }
+
+    private val draggingItemLayoutInfo: LazyGridItemInfo?
+        get() = gridState.layoutInfo.visibleItemsInfo.firstOrNull { it.key == draggingItemKey }
+
+    internal var previousKeyOfDraggedItem by mutableStateOf<Any?>(null)
+        private set
+    internal var previousItemOffset = Animatable(Offset.Zero, Offset.VectorConverter)
+        private set
+
+    internal fun onTouchSlopPassed(offset: Offset, shouldLongPress: Boolean) {
+        gridState.findItem(offset)?.also {
+            draggingItemKey = it.key
+            if (shouldLongPress) {
+                hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                onLongPress(it)
+            }
+            draggingItemInitialOffset = it.offset.toOffset()
+            moved = !shouldLongPress
+        }
+    }
+
+    internal fun onDragInterrupted() {
+        if (draggingItemKey != null) {
+            previousKeyOfDraggedItem = draggingItemKey
+            val startOffset = draggingItemOffset
+            scope.launch {
+                previousItemOffset.snapTo(startOffset)
+                previousItemOffset.animateTo(
+                    Offset.Zero,
+                    spring(
+                        stiffness = Spring.StiffnessMediumLow,
+                        visibilityThreshold = Offset.VisibilityThreshold,
+                    ),
+                )
+                previousKeyOfDraggedItem = null
+            }
+        }
+        draggingItemCumulatedOffset = Offset.Zero
+        draggingItemKey = null
+        draggingItemInitialOffset = Offset.Zero
+    }
+
+    internal fun onDrag(offset: Offset) {
+        draggingItemCumulatedOffset += offset
+
+        if (draggingItemLayoutInfo == null) {
+            moved = false
+        }
+        val draggingItem = draggingItemLayoutInfo ?: return
+
+        if (!moved && draggingItemCumulatedOffset.getDistance() > touchSlop) {
+            onExitLongPress()
+        }
+        val startOffset = draggingItem.offset.toOffset() + draggingItemOffset
+        val endOffset = Offset(
+            startOffset.x + draggingItem.size.toSize().width,
+            startOffset.y + draggingItem.size.toSize().height,
+        )
+        val middleOffset = startOffset + (endOffset - startOffset) / 2f
+
+        val targetItem = gridState.layoutInfo.visibleItemsInfo.find { item ->
+            middleOffset.x.toInt() in item.offset.x..item.endOffset.x &&
+                middleOffset.y.toInt() in item.offset.y..item.endOffset.y &&
+                draggingItemKey != item.key
+        }
+        if (targetItem != null && targetItem.key !in ignoredItems) {
+            if (draggingItem.index == gridState.firstVisibleItemIndex) {
+                scope.launch {
+                    gridState.scrollBy(-draggingItem.size.height.toFloat())
+                }
+            }
+            onMove.invoke(draggingItem, targetItem)
+        } else {
+            val overscroll = when {
+                draggingItemCumulatedOffset.y > 0 ->
+                    (endOffset.y - gridState.layoutInfo.viewportEndOffset).coerceAtLeast(0f)
+
+                draggingItemCumulatedOffset.y < 0 ->
+                    (startOffset.y - gridState.layoutInfo.viewportStartOffset).coerceAtMost(0f)
+
+                else -> 0f
+            }
+            if (overscroll != 0f) {
+                scope.launch {
+                    gridState.scrollBy(overscroll)
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Container for draggable grid item.
+ *
+ * @param state State of the lazy grid.
+ * @param key Key of the item to be displayed.
+ * @param position Position in the grid of the item to be displayed.
+ * @param content Content of the item to be displayed.
+ */
+@ExperimentalFoundationApi
+@Composable
+fun LazyGridItemScope.DragItemContainer(
+    state: GridReorderState,
+    key: Any,
+    position: Int,
+    content: @Composable () -> Unit,
+) {
+    val modifier = when (key) {
+        state.draggingItemKey -> {
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer {
+                    translationX = state.computeItemOffset(position).x
+                    translationY = state.computeItemOffset(position).y
+                }
+        }
+
+        state.previousKeyOfDraggedItem -> {
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer {
+                    translationX = state.previousItemOffset.value.x
+                    translationY = state.previousItemOffset.value.y
+                }
+        }
+
+        else -> {
+            Modifier
+                .zIndex(0f)
+                .animateItemPlacement(tween())
+        }
+    }
+
+    Box(modifier = modifier, propagateMinConstraints = true) {
+        content()
+    }
+}
+
+/**
+ * Calculate the offset of an item taking its width and height into account.
+ */
+private val LazyGridItemInfo.endOffset: IntOffset
+    get() = IntOffset(offset.x + size.width, offset.y + size.height)
+
+/**
+ * Find item based on position on screen.
+ *
+ * @param offset Position on screen used to find the item.
+ */
+private fun LazyGridState.findItem(offset: Offset) =
+    layoutInfo.visibleItemsInfo.firstOrNull { item ->
+        offset.x.toInt() in item.offset.x..item.endOffset.x && offset.y.toInt() in item.offset.y..item.endOffset.y
+    }
+
+/**
+ * Detects press, long press and drag gestures.
+ *
+ * @param gridState State of the grid.
+ * @param reorderState Grid reordering state used for dragging callbacks.
+ * @param shouldLongPressToDrag Whether or not an item should be long pressed to start the dragging gesture.
+ */
+fun Modifier.detectGridPressAndDragGestures(
+    gridState: LazyGridState,
+    reorderState: GridReorderState,
+    shouldLongPressToDrag: Boolean,
+): Modifier = pointerInput(gridState, shouldLongPressToDrag) {
+    if (shouldLongPressToDrag) {
+        detectDragGesturesAfterLongPress(
+            onDragStart = { offset -> reorderState.onTouchSlopPassed(offset, true) },
+            onDrag = { change, dragAmount ->
+                change.consume()
+                reorderState.onDrag(dragAmount)
+            },
+            onDragEnd = reorderState::onDragInterrupted,
+            onDragCancel = reorderState::onDragInterrupted,
+        )
+    } else {
+        detectDragGestures(
+            onDragStart = { offset -> reorderState.onTouchSlopPassed(offset, false) },
+            onDrag = { change, dragAmount ->
+                change.consume()
+                reorderState.onDrag(dragAmount)
+            },
+            onDragEnd = reorderState::onDragInterrupted,
+            onDragCancel = reorderState::onDragInterrupted,
+        )
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableList.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableList.kt
new file mode 100644
index 000000000..de8557050
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/compose/ReorderableList.kt
@@ -0,0 +1,285 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabstray.browser.compose
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.lazy.LazyItemScope
+import androidx.compose.foundation.lazy.LazyListItemInfo
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.hapticfeedback.HapticFeedback
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlin.math.abs
+
+/**
+ * Remember the reordering state for reordering list items.
+ *
+ * @param listState State of the list.
+ * @param onMove Callback to be invoked when switching between two items.
+ * @param ignoredItems List of keys for non-draggable items.
+ * @param onLongPress Callback to be invoked when long pressing an item.
+ * @param onExitLongPress Callback to be invoked when the item is dragged after long press.
+ */
+@Composable
+fun createListReorderState(
+    listState: LazyListState,
+    onMove: (LazyListItemInfo, LazyListItemInfo) -> Unit,
+    ignoredItems: List<Any>,
+    onLongPress: (LazyListItemInfo) -> Unit = {},
+    onExitLongPress: () -> Unit = {},
+): ListReorderState {
+    val scope = rememberCoroutineScope()
+    val touchSlop = LocalViewConfiguration.current.touchSlop
+    val hapticFeedback = LocalHapticFeedback.current
+    val state = remember(listState) {
+        ListReorderState(
+            listState = listState,
+            onMove = onMove,
+            scope = scope,
+            touchSlop = touchSlop,
+            hapticFeedback = hapticFeedback,
+            ignoredItems = ignoredItems,
+            onLongPress = onLongPress,
+            onExitLongPress = onExitLongPress,
+        )
+    }
+    return state
+}
+
+/**
+ * Class containing details about the current state of dragging in list.
+ *
+ * @param listState State of the list.
+ * @param scope [CoroutineScope] used for scrolling to the target item.
+ * @param hapticFeedback [HapticFeedback] used for performing haptic feedback on item long press.
+ * @param touchSlop Distance in pixels the user can wander until we consider they started dragging.
+ * @param onMove Callback to be invoked when switching between two items.
+ * @param onLongPress Optional callback to be invoked when long pressing an item.
+ * @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
+ * @param ignoredItems List of keys for non-draggable items.
+ */
+@Suppress("LongParameterList")
+class ListReorderState internal constructor(
+    private val listState: LazyListState,
+    private val scope: CoroutineScope,
+    private val hapticFeedback: HapticFeedback,
+    private val touchSlop: Float,
+    private val onMove: (LazyListItemInfo, LazyListItemInfo) -> Unit,
+    private val ignoredItems: List<Any>,
+    private val onLongPress: (LazyListItemInfo) -> Unit,
+    private val onExitLongPress: () -> Unit,
+) {
+    var draggingItemKey by mutableStateOf<Any?>(null)
+        private set
+
+    private var draggingItemCumulatedOffset by mutableFloatStateOf(0f)
+    private var draggingItemInitialOffset by mutableFloatStateOf(0f)
+    internal var moved by mutableStateOf(false)
+    private val draggingItemOffset: Float
+        get() = draggingItemLayoutInfo?.let { item ->
+            draggingItemInitialOffset + draggingItemCumulatedOffset - item.offset
+        } ?: 0f
+
+    internal fun computeItemOffset(index: Int): Float {
+        val itemAtIndex = listState.layoutInfo.visibleItemsInfo.firstOrNull { info -> info.index == index }
+            ?: return draggingItemOffset
+        return draggingItemInitialOffset + draggingItemCumulatedOffset - itemAtIndex.offset
+    }
+
+    private val draggingItemLayoutInfo: LazyListItemInfo?
+        get() = listState.layoutInfo.visibleItemsInfo.firstOrNull { it.key == draggingItemKey }
+
+    internal var previousKeyOfDraggedItem by mutableStateOf<Any?>(null)
+        private set
+    internal var previousItemOffset = Animatable(0f)
+        private set
+
+    internal fun onTouchSlopPassed(offset: Float, shouldLongPress: Boolean) {
+        listState.findItem(offset)?.also {
+            draggingItemKey = it.key
+            if (shouldLongPress) {
+                hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                onLongPress(it)
+            }
+            draggingItemInitialOffset = it.offset.toFloat()
+            moved = !shouldLongPress
+        }
+    }
+
+    internal fun onDragInterrupted() {
+        if (draggingItemKey != null) {
+            previousKeyOfDraggedItem = draggingItemKey
+            val startOffset = draggingItemOffset
+            scope.launch {
+                previousItemOffset.snapTo(startOffset)
+                previousItemOffset.animateTo(
+                    0f,
+                    spring(
+                        stiffness = Spring.StiffnessMediumLow,
+                        visibilityThreshold = 1f,
+                    ),
+                )
+                previousKeyOfDraggedItem = null
+            }
+        }
+        draggingItemCumulatedOffset = 0f
+        draggingItemKey = null
+        draggingItemInitialOffset = 0f
+    }
+
+    internal fun onDrag(offset: Float) {
+        draggingItemCumulatedOffset += offset
+
+        if (draggingItemLayoutInfo == null) {
+            moved = false
+        }
+        val draggingItem = draggingItemLayoutInfo ?: return
+
+        if (!moved && abs(draggingItemCumulatedOffset) > touchSlop) {
+            onExitLongPress()
+        }
+        val startOffset = draggingItem.offset + draggingItemOffset
+        val endOffset = startOffset + draggingItem.size
+        val middleOffset = startOffset + (endOffset - startOffset) / 2f
+
+        val targetItem = listState.layoutInfo.visibleItemsInfo.find { item ->
+            middleOffset.toInt() in item.offset..item.endOffset && draggingItemKey != item.key
+        }
+
+        if (targetItem != null && targetItem.key !in ignoredItems) {
+            if (draggingItem.index == listState.firstVisibleItemIndex ||
+                targetItem.index == listState.firstVisibleItemIndex
+            ) {
+                scope.launch {
+                    onMove.invoke(draggingItem, targetItem)
+                    listState.scrollBy(draggingItem.size.toFloat())
+                }
+            } else {
+                onMove.invoke(draggingItem, targetItem)
+            }
+        } else {
+            val overscroll = when {
+                draggingItemCumulatedOffset > 0 ->
+                    (endOffset - listState.layoutInfo.viewportEndOffset).coerceAtLeast(0f)
+
+                draggingItemCumulatedOffset < 0 ->
+                    (startOffset - listState.layoutInfo.viewportStartOffset).coerceAtMost(0f)
+
+                else -> 0f
+            }
+            if (overscroll != 0f) {
+                scope.launch {
+                    listState.scrollBy(overscroll)
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Container for draggable list item.
+ *
+ * @param state List reordering state.
+ * @param key Key of the item to be displayed.
+ * @param position Position in the list of the item to be displayed.
+ * @param content Content of the item to be displayed.
+ */
+@ExperimentalFoundationApi
+@Composable
+fun LazyItemScope.DragItemContainer(
+    state: ListReorderState,
+    key: Any,
+    position: Int,
+    content: @Composable () -> Unit,
+) {
+    val modifier = when (key) {
+        state.draggingItemKey -> {
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer {
+                    translationY = state.computeItemOffset(position)
+                }
+        }
+
+        state.previousKeyOfDraggedItem -> {
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer {
+                    translationY = state.previousItemOffset.value
+                }
+        }
+
+        else -> {
+            Modifier
+                .zIndex(0f)
+                .animateItemPlacement(tween())
+        }
+    }
+    Box(modifier = modifier, propagateMinConstraints = true) {
+        content()
+    }
+}
+
+/**
+ * Calculates the offset of an item taking its height into account.
+ */
+private val LazyListItemInfo.endOffset: Int
+    get() = offset + size
+
+/**
+ * Find item based on position on screen.
+ *
+ * @param offset Position on screen used to find the item.
+ */
+private fun LazyListState.findItem(offset: Float) =
+    layoutInfo.visibleItemsInfo.firstOrNull { item ->
+        offset.toInt() in item.offset..item.endOffset
+    }
+
+/**
+ * Detects press, long press and drag gestures.
+ *
+ * @param listState State of the list.
+ * @param reorderState List reordering state used for dragging callbacks.
+ * @param shouldLongPressToDrag Whether or not an item should be long pressed to start the dragging gesture.
+ */
+fun Modifier.detectVerticalPressAndDrag(
+    listState: LazyListState,
+    reorderState: ListReorderState,
+    shouldLongPressToDrag: Boolean,
+): Modifier = pointerInput(listState, shouldLongPressToDrag) {
+    if (shouldLongPressToDrag) {
+        detectDragGesturesAfterLongPress(
+            onDragStart = { offset -> reorderState.onTouchSlopPassed(offset.y, true) },
+            onDrag = { change, dragAmount ->
+                change.consume()
+                reorderState.onDrag(dragAmount.y)
+            },
+            onDragEnd = reorderState::onDragInterrupted,
+            onDragCancel = reorderState::onDragInterrupted,
+        )
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/ext/SyncedDeviceTabs.kt b/app/src/main/java/org/mozilla/fenix/tabstray/ext/SyncedDeviceTabs.kt
index f66bf6560..39462fa9b 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/ext/SyncedDeviceTabs.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/ext/SyncedDeviceTabs.kt
@@ -11,32 +11,16 @@ import org.mozilla.fenix.tabstray.syncedtabs.SyncedTabsListItem
 /**
  * Converts a list of [SyncedDeviceTabs] into a list of [SyncedTabsListItem].
  */
-fun List<SyncedDeviceTabs>.toComposeList(
-    taskContinuityEnabled: Boolean,
-): List<SyncedTabsListItem> = asSequence().flatMap { (device, tabs) ->
-    if (taskContinuityEnabled) {
-        val deviceTabs = if (tabs.isEmpty()) {
-            emptyList()
-        } else {
-            tabs.map {
-                val url = it.active().url
-                val titleText = it.active().title.ifEmpty { url.trimmed() }
-                SyncedTabsListItem.Tab(titleText, url, it)
-            }
-        }
-
-        sequenceOf(SyncedTabsListItem.DeviceSection(device.displayName, deviceTabs))
+fun List<SyncedDeviceTabs>.toComposeList(): List<SyncedTabsListItem> = asSequence().flatMap { (device, tabs) ->
+    val deviceTabs = if (tabs.isEmpty()) {
+        emptyList()
     } else {
-        val deviceTabs = if (tabs.isEmpty()) {
-            sequenceOf(SyncedTabsListItem.NoTabs)
-        } else {
-            tabs.asSequence().map {
-                val url = it.active().url
-                val titleText = it.active().title.ifEmpty { url.trimmed() }
-                SyncedTabsListItem.Tab(titleText, url, it)
-            }
+        tabs.map {
+            val url = it.active().url
+            val titleText = it.active().title.ifEmpty { url.trimmed() }
+            SyncedTabsListItem.Tab(titleText, url, it)
         }
-
-        sequenceOf(SyncedTabsListItem.Device(device.displayName)) + deviceTabs
     }
+
+    sequenceOf(SyncedTabsListItem.DeviceSection(device.displayName, deviceTabs))
 }.toList()
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabsTrayState.kt b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabsTrayState.kt
index 96434cc5d..50edcba44 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabsTrayState.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/ext/TabsTrayState.kt
@@ -4,9 +4,181 @@
 
 package org.mozilla.fenix.tabstray.ext
 
+import android.content.res.Resources
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.MenuItem
+import org.mozilla.fenix.tabstray.Page
 import org.mozilla.fenix.tabstray.TabsTrayState.Mode
+import org.mozilla.fenix.tabstray.TabsTrayTestTag
 
 /**
  * A helper to check if we're in [Mode.Select] mode.
  */
 fun Mode.isSelect() = this is Mode.Select
+
+/**
+ * Returns the list of menu items corresponding to the selected mode
+ *
+ * @param resources The resources used to provide the strings for the menu item titles.
+ * @param shouldShowInactiveButton Whether or not to show the inactive tabs menu item.
+ * @param selectedPage The currently selected page.
+ * @param normalTabCount The normal tabs number.
+ * @param privateTabCount The private tabs number.
+ * @param onBookmarkSelectedTabsClick Invoked when user interacts with the bookmark menu item.
+ * @param onCloseSelectedTabsClick Invoked when user interacts with the close menu item.
+ * @param onMakeSelectedTabsInactive Invoked when user interacts with the make inactive menu item.
+ * @param onTabSettingsClick Invoked when user interacts with the tab settings menu.
+ * @param onRecentlyClosedClick Invoked when user interacts with the recently closed menu item.
+ * @param onEnterMultiselectModeClick Invoked when user enters the multiselect mode.
+ * @param onShareAllTabsClick Invoked when user interacts with the share all menu item.
+ * @param onDeleteAllTabsClick Invoked when user interacts with the delete all menu item.
+ * @param onAccountSettingsClick Invoked when user interacts with the account settings.
+ */
+@Suppress("LongParameterList")
+fun Mode.getMenuItems(
+    resources: Resources,
+    shouldShowInactiveButton: Boolean,
+    selectedPage: Page,
+    normalTabCount: Int,
+    privateTabCount: Int,
+    onBookmarkSelectedTabsClick: () -> Unit,
+    onCloseSelectedTabsClick: () -> Unit,
+    onMakeSelectedTabsInactive: () -> Unit,
+    onTabSettingsClick: () -> Unit,
+    onRecentlyClosedClick: () -> Unit,
+    onEnterMultiselectModeClick: () -> Unit,
+    onShareAllTabsClick: () -> Unit,
+    onDeleteAllTabsClick: () -> Unit,
+    onAccountSettingsClick: () -> Unit,
+): List<MenuItem> {
+    return if (this.isSelect()) {
+        generateMultiSelectBannerMenuItems(
+            resources = resources,
+            shouldShowInactiveButton = shouldShowInactiveButton,
+            onBookmarkSelectedTabsClick = onBookmarkSelectedTabsClick,
+            onCloseSelectedTabsClick = onCloseSelectedTabsClick,
+            onMakeSelectedTabsInactive = onMakeSelectedTabsInactive,
+        )
+    } else {
+        generateSingleSelectBannerMenuItems(
+            resources = resources,
+            selectedPage = selectedPage,
+            normalTabCount = normalTabCount,
+            privateTabCount = privateTabCount,
+            onTabSettingsClick = onTabSettingsClick,
+            onRecentlyClosedClick = onRecentlyClosedClick,
+            onEnterMultiselectModeClick = onEnterMultiselectModeClick,
+            onShareAllTabsClick = onShareAllTabsClick,
+            onDeleteAllTabsClick = onDeleteAllTabsClick,
+            onAccountSettingsClick = onAccountSettingsClick,
+        )
+    }
+}
+
+/**
+ *  Builds the menu items list when in multiselect mode
+ */
+private fun generateMultiSelectBannerMenuItems(
+    resources: Resources,
+    shouldShowInactiveButton: Boolean,
+    onBookmarkSelectedTabsClick: () -> Unit,
+    onCloseSelectedTabsClick: () -> Unit,
+    onMakeSelectedTabsInactive: () -> Unit,
+): List<MenuItem> {
+    val menuItems = mutableListOf(
+        MenuItem(
+            title = resources.getString(R.string.tab_tray_multiselect_menu_item_bookmark),
+            onClick = onBookmarkSelectedTabsClick,
+        ),
+        MenuItem(
+            title = resources.getString(R.string.tab_tray_multiselect_menu_item_close),
+            onClick = onCloseSelectedTabsClick,
+        ),
+    )
+    if (shouldShowInactiveButton) {
+        menuItems.add(
+            MenuItem(
+                title = resources.getString(R.string.inactive_tabs_menu_item),
+                onClick = onMakeSelectedTabsInactive,
+            ),
+        )
+    }
+
+    return menuItems
+}
+
+/**
+ *  Builds the menu items list when in normal mode
+ */
+@Suppress("LongParameterList")
+private fun generateSingleSelectBannerMenuItems(
+    resources: Resources,
+    selectedPage: Page,
+    normalTabCount: Int,
+    privateTabCount: Int,
+    onTabSettingsClick: () -> Unit,
+    onRecentlyClosedClick: () -> Unit,
+    onEnterMultiselectModeClick: () -> Unit,
+    onShareAllTabsClick: () -> Unit,
+    onDeleteAllTabsClick: () -> Unit,
+    onAccountSettingsClick: () -> Unit,
+): List<MenuItem> {
+    val tabSettingsItem = MenuItem(
+        title = resources.getString(R.string.tab_tray_menu_tab_settings),
+        testTag = TabsTrayTestTag.tabSettings,
+        onClick = onTabSettingsClick,
+    )
+    val recentlyClosedTabsItem = MenuItem(
+        title = resources.getString(R.string.tab_tray_menu_recently_closed),
+        testTag = TabsTrayTestTag.recentlyClosedTabs,
+        onClick = onRecentlyClosedClick,
+    )
+    val enterSelectModeItem = MenuItem(
+        title = resources.getString(R.string.tabs_tray_select_tabs),
+        testTag = TabsTrayTestTag.selectTabs,
+        onClick = onEnterMultiselectModeClick,
+    )
+    val shareAllTabsItem = MenuItem(
+        title = resources.getString(R.string.tab_tray_menu_item_share),
+        testTag = TabsTrayTestTag.shareAllTabs,
+        onClick = onShareAllTabsClick,
+    )
+    val deleteAllTabsItem = MenuItem(
+        title = resources.getString(R.string.tab_tray_menu_item_close),
+        testTag = TabsTrayTestTag.closeAllTabs,
+        onClick = onDeleteAllTabsClick,
+    )
+    val accountSettingsItem = MenuItem(
+        title = resources.getString(R.string.tab_tray_menu_account_settings),
+        testTag = TabsTrayTestTag.accountSettings,
+        onClick = onAccountSettingsClick,
+    )
+    return when {
+        selectedPage == Page.NormalTabs && normalTabCount == 0 ||
+            selectedPage == Page.PrivateTabs && privateTabCount == 0 -> listOf(
+            tabSettingsItem,
+            recentlyClosedTabsItem,
+        )
+
+        selectedPage == Page.NormalTabs -> listOf(
+            enterSelectModeItem,
+            shareAllTabsItem,
+            tabSettingsItem,
+            recentlyClosedTabsItem,
+            deleteAllTabsItem,
+        )
+
+        selectedPage == Page.PrivateTabs -> listOf(
+            tabSettingsItem,
+            recentlyClosedTabsItem,
+            deleteAllTabsItem,
+        )
+
+        selectedPage == Page.SyncedTabs -> listOf(
+            accountSettingsItem,
+            recentlyClosedTabsItem,
+        )
+
+        else -> emptyList()
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
index f7950474a..489914cd8 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
@@ -50,7 +50,6 @@ private const val EXPANDED_BY_DEFAULT = true
  * Top-level list UI for displaying Synced Tabs in the Tabs Tray.
  *
  * @param syncedTabs The tab UI items to be displayed.
- * @param taskContinuityEnabled Indicates whether the Task Continuity enhancements should be visible for users.
  * @param onTabClick The lambda for handling clicks on synced tabs.
  */
 @SuppressWarnings("LongMethod")
@@ -58,7 +57,6 @@ private const val EXPANDED_BY_DEFAULT = true
 @Composable
 fun SyncedTabsList(
     syncedTabs: List<SyncedTabsListItem>,
-    taskContinuityEnabled: Boolean,
     onTabClick: (SyncTab) -> Unit,
 ) {
     val listState = rememberLazyListState()
@@ -71,70 +69,46 @@ fun SyncedTabsList(
             .testTag(TabsTrayTestTag.syncedTabsList),
         state = listState,
     ) {
-        if (taskContinuityEnabled) {
-            syncedTabs.forEachIndexed { index, syncedTabItem ->
-                when (syncedTabItem) {
-                    is SyncedTabsListItem.DeviceSection -> {
-                        val sectionExpanded = expandedState[index]
+        syncedTabs.forEachIndexed { index, syncedTabItem ->
+            when (syncedTabItem) {
+                is SyncedTabsListItem.DeviceSection -> {
+                    val sectionExpanded = expandedState[index]
 
-                        stickyHeader {
-                            SyncedTabsSectionHeader(
-                                headerText = syncedTabItem.displayName,
-                                expanded = sectionExpanded,
-                            ) {
-                                expandedState[index] = !sectionExpanded
-                            }
-                        }
-
-                        if (sectionExpanded) {
-                            if (syncedTabItem.tabs.isNotEmpty()) {
-                                items(syncedTabItem.tabs) { syncedTab ->
-                                    FaviconListItem(
-                                        label = syncedTab.displayTitle,
-                                        description = syncedTab.displayURL,
-                                        url = syncedTab.displayURL,
-                                        onClick = { onTabClick(syncedTab.tab) },
-                                    )
-                                }
-                            } else {
-                                item { SyncedTabsNoTabsItem() }
-                            }
+                    stickyHeader {
+                        SyncedTabsSectionHeader(
+                            headerText = syncedTabItem.displayName,
+                            expanded = sectionExpanded,
+                        ) {
+                            expandedState[index] = !sectionExpanded
                         }
                     }
 
-                    is SyncedTabsListItem.Error -> {
-                        item {
-                            SyncedTabsErrorItem(
-                                errorText = syncedTabItem.errorText,
-                                errorButton = syncedTabItem.errorButton,
-                            )
+                    if (sectionExpanded) {
+                        if (syncedTabItem.tabs.isNotEmpty()) {
+                            items(syncedTabItem.tabs) { syncedTab ->
+                                FaviconListItem(
+                                    label = syncedTab.displayTitle,
+                                    description = syncedTab.displayURL,
+                                    url = syncedTab.displayURL,
+                                    onClick = { onTabClick(syncedTab.tab) },
+                                )
+                            }
+                        } else {
+                            item { SyncedTabsNoTabsItem() }
                         }
                     }
-                    else -> {
-                        // no-op
-                    }
                 }
-            }
-        } else {
-            items(syncedTabs) { syncedTabItem ->
-                when (syncedTabItem) {
-                    is SyncedTabsListItem.Device -> SyncedTabsSectionHeader(headerText = syncedTabItem.displayName)
-                    is SyncedTabsListItem.Error -> SyncedTabsErrorItem(
-                        errorText = syncedTabItem.errorText,
-                        errorButton = syncedTabItem.errorButton,
-                    )
-                    is SyncedTabsListItem.NoTabs -> SyncedTabsNoTabsItem()
-                    is SyncedTabsListItem.Tab -> {
-                        FaviconListItem(
-                            label = syncedTabItem.displayTitle,
-                            description = syncedTabItem.displayURL,
-                            url = syncedTabItem.displayURL,
-                            onClick = { onTabClick(syncedTabItem.tab) },
+
+                is SyncedTabsListItem.Error -> {
+                    item {
+                        SyncedTabsErrorItem(
+                            errorText = syncedTabItem.errorText,
+                            errorButton = syncedTabItem.errorButton,
                         )
                     }
-                    else -> {
-                        // no-op
-                    }
+                }
+                else -> {
+                    // no-op
                 }
             }
         }
@@ -300,7 +274,6 @@ private fun SyncedTabsListPreview() {
         Box(Modifier.background(FirefoxTheme.colors.layer1)) {
             SyncedTabsList(
                 syncedTabs = getFakeSyncedTabList(),
-                taskContinuityEnabled = true,
             ) {
                 println("Tab clicked")
             }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt
index 2bb98f986..6281609ef 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt
@@ -15,7 +15,6 @@ import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.base.observer.Observable
 import mozilla.components.support.base.observer.ObserverRegistry
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.tabstray.FloatingActionButtonBinding
 import org.mozilla.fenix.tabstray.TabsTrayAction
 import org.mozilla.fenix.tabstray.TabsTrayStore
@@ -92,9 +91,7 @@ class SyncedTabsIntegration(
     override fun displaySyncedTabs(syncedTabs: List<SyncedDeviceTabs>) {
         store.dispatch(
             TabsTrayAction.UpdateSyncedTabs(
-                syncedTabs.toComposeList(
-                    context.settings().enableTaskContinuityEnhancements,
-                ),
+                syncedTabs.toComposeList(),
             ),
         )
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
index 27fdcfcf1..58ef98f1f 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/SyncedTabsPageViewHolder.kt
@@ -8,7 +8,6 @@ import android.view.View
 import androidx.compose.ui.platform.ComposeView
 import androidx.recyclerview.widget.RecyclerView
 import mozilla.components.lib.state.ext.observeAsComposableState
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.tabstray.SyncedTabsInteractor
 import org.mozilla.fenix.tabstray.TabsTrayState
 import org.mozilla.fenix.tabstray.TabsTrayStore
@@ -35,7 +34,6 @@ class SyncedTabsPageViewHolder(
             FirefoxTheme(theme = Theme.getTheme(allowPrivateTheme = false)) {
                 SyncedTabsList(
                     syncedTabs = tabs ?: emptyList(),
-                    taskContinuityEnabled = composeView.context.settings().enableTaskContinuityEnhancements,
                     onTabClick = interactor::onSyncedTabClicked,
                 )
             }
diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index d18d9bc38..73018dc50 100644
--- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -100,10 +100,18 @@ private val darkColorPalette = FirefoxColors(
     scrim = PhotonColors.DarkGrey90A95,
     gradientStart = PhotonColors.Violet70,
     gradientEnd = PhotonColors.Violet40,
+    layerWarning = PhotonColors.Yellow70A77,
+    layerConfirmation = PhotonColors.Green80,
+    layerError = PhotonColors.Pink80,
+    layerInfo = PhotonColors.Blue50A80,
     actionPrimary = PhotonColors.Violet60,
     actionSecondary = PhotonColors.LightGrey30,
     actionTertiary = PhotonColors.DarkGrey10,
     actionQuarternary = PhotonColors.DarkGrey80,
+    actionWarning = PhotonColors.Yellow40A41,
+    actionConfirmation = PhotonColors.Green70,
+    actionError = PhotonColors.Pink70A69,
+    actionInfo = PhotonColors.Blue30,
     formDefault = PhotonColors.LightGrey05,
     formSelected = PhotonColors.Violet40,
     formSurface = PhotonColors.DarkGrey05,
@@ -166,10 +174,18 @@ private val lightColorPalette = FirefoxColors(
     scrim = PhotonColors.DarkGrey30A95,
     gradientStart = PhotonColors.Violet70,
     gradientEnd = PhotonColors.Violet40,
+    layerWarning = PhotonColors.Yellow20,
+    layerConfirmation = PhotonColors.Green20,
+    layerError = PhotonColors.Red10,
+    layerInfo = PhotonColors.Blue50A44,
     actionPrimary = PhotonColors.Ink20,
     actionSecondary = PhotonColors.LightGrey30,
     actionTertiary = PhotonColors.LightGrey40,
     actionQuarternary = PhotonColors.LightGrey10,
+    actionWarning = PhotonColors.Yellow60A40,
+    actionConfirmation = PhotonColors.Green60,
+    actionError = PhotonColors.Red30,
+    actionInfo = PhotonColors.Blue50,
     formDefault = PhotonColors.DarkGrey90,
     formSelected = PhotonColors.Ink20,
     formSurface = PhotonColors.LightGrey50,
@@ -243,10 +259,18 @@ class FirefoxColors(
     scrim: Color,
     gradientStart: Color,
     gradientEnd: Color,
+    layerWarning: Color,
+    layerConfirmation: Color,
+    layerError: Color,
+    layerInfo: Color,
     actionPrimary: Color,
     actionSecondary: Color,
     actionTertiary: Color,
     actionQuarternary: Color,
+    actionWarning: Color,
+    actionConfirmation: Color,
+    actionError: Color,
+    actionInfo: Color,
     formDefault: Color,
     formSelected: Color,
     formSurface: Color,
@@ -332,6 +356,7 @@ class FirefoxColors(
     // Selected tab
     var layerAccentOpaque by mutableStateOf(layerAccentOpaque)
         private set
+
     var scrim by mutableStateOf(scrim)
         private set
 
@@ -343,6 +368,22 @@ class FirefoxColors(
     var gradientEnd by mutableStateOf(gradientEnd)
         private set
 
+    // Warning background
+    var layerWarning by mutableStateOf(layerWarning)
+        private set
+
+    // Confirmation background
+    var layerConfirmation by mutableStateOf(layerConfirmation)
+        private set
+
+    // Error Background
+    var layerError by mutableStateOf(layerError)
+        private set
+
+    // Info background
+    var layerInfo by mutableStateOf(layerInfo)
+        private set
+
     // Actions
 
     // Primary button, Snackbar, Floating action button, Chip selected
@@ -361,6 +402,22 @@ class FirefoxColors(
     var actionQuarternary by mutableStateOf(actionQuarternary)
         private set
 
+    // Warning button
+    var actionWarning by mutableStateOf(actionWarning)
+        private set
+
+    // Confirmation button
+    var actionConfirmation by mutableStateOf(actionConfirmation)
+        private set
+
+    // Error button
+    var actionError by mutableStateOf(actionError)
+        private set
+
+    // Info button
+    var actionInfo by mutableStateOf(actionInfo)
+        private set
+
     // Checkbox default, Radio button default
     var formDefault by mutableStateOf(formDefault)
         private set
@@ -556,10 +613,18 @@ class FirefoxColors(
         scrim = other.scrim
         gradientStart = other.gradientStart
         gradientEnd = other.gradientEnd
+        layerWarning = other.layerWarning
+        layerConfirmation = other.layerConfirmation
+        layerError = other.layerError
+        layerInfo = other.layerInfo
         actionPrimary = other.actionPrimary
         actionSecondary = other.actionSecondary
         actionTertiary = other.actionTertiary
         actionQuarternary = other.actionQuarternary
+        actionWarning = other.actionWarning
+        actionConfirmation = other.actionConfirmation
+        actionError = other.actionError
+        actionInfo = other.actionInfo
         formDefault = other.formDefault
         formSelected = other.formSelected
         formSurface = other.formSurface
@@ -625,10 +690,18 @@ class FirefoxColors(
         scrim: Color = this.scrim,
         gradientStart: Color = this.gradientStart,
         gradientEnd: Color = this.gradientEnd,
+        layerWarning: Color = this.layerWarning,
+        layerConfirmation: Color = this.layerConfirmation,
+        layerError: Color = this.layerError,
+        layerInfo: Color = this.layerInfo,
         actionPrimary: Color = this.actionPrimary,
         actionSecondary: Color = this.actionSecondary,
         actionTertiary: Color = this.actionTertiary,
         actionQuarternary: Color = this.actionQuarternary,
+        actionWarning: Color = this.actionWarning,
+        actionConfirmation: Color = this.actionConfirmation,
+        actionError: Color = this.actionError,
+        actionInfo: Color = this.actionInfo,
         formDefault: Color = this.formDefault,
         formSelected: Color = this.formSelected,
         formSurface: Color = this.formSurface,
@@ -689,10 +762,18 @@ class FirefoxColors(
         scrim = scrim,
         gradientStart = gradientStart,
         gradientEnd = gradientEnd,
+        layerWarning = layerWarning,
+        layerConfirmation = layerConfirmation,
+        layerError = layerError,
+        layerInfo = layerInfo,
         actionPrimary = actionPrimary,
         actionSecondary = actionSecondary,
         actionTertiary = actionTertiary,
         actionQuarternary = actionQuarternary,
+        actionWarning = actionWarning,
+        actionConfirmation = actionConfirmation,
+        actionError = actionError,
+        actionInfo = actionInfo,
         formDefault = formDefault,
         formSelected = formSelected,
         formSurface = formSurface,
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 1acdc4a7d..b1f1a9f8c 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -779,6 +779,15 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = { enabledTotalCookieProtectionCFR },
     )
 
+    /**
+     * Indicates if the total cookie protection CRF should be shown.
+     */
+    var shouldShowEraseActionCFR by lazyFeatureFlagPreference(
+        appContext.getPreferenceKey(R.string.pref_key_should_show_erase_action_popup),
+        featureFlag = true,
+        default = { feltPrivateBrowsingEnabled },
+    )
+
     val blockCookiesSelectionInCustomTrackingProtection by stringPreference(
         key = appContext.getPreferenceKey(R.string.pref_key_tracking_protection_custom_cookies_select),
         default = if (enabledTotalCookieProtection) {
@@ -1217,19 +1226,42 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = true,
     )
 
-    fun addSearchWidgetInstalled(count: Int) {
-        val key = appContext.getPreferenceKey(R.string.pref_key_search_widget_installed)
-        val newValue = preferences.getInt(key, 0) + count
+    /**
+     * Used in [SearchWidgetProvider] to update when the search widget
+     * exists on home screen or if it has been removed completely.
+     */
+    fun setSearchWidgetInstalled(installed: Boolean) {
+        val key = appContext.getPreferenceKey(R.string.pref_key_search_widget_installed_2)
         preferences.edit()
-            .putInt(key, newValue)
+            .putBoolean(key, installed)
             .apply()
     }
 
-    val searchWidgetInstalled: Boolean
-        get() = 0 < preferences.getInt(
-            appContext.getPreferenceKey(R.string.pref_key_search_widget_installed),
-            0,
-        )
+    /**
+     * In Bug 1853113, we changed the type of [searchWidgetInstalled] from int to boolean without
+     * changing the pref key, now we have to migrate users that were using the previous type int
+     * to the new one boolean. The migration will only happens if pref_key_search_widget_installed
+     * is detected.
+     */
+    fun migrateSearchWidgetInstalledPrefIfNeeded() {
+        val oldKey = "pref_key_search_widget_installed"
+        val installedCount = try {
+            preferences.getInt(oldKey, 0)
+        } catch (e: ClassCastException) {
+            0
+        }
+
+        if (installedCount > 0) {
+            setSearchWidgetInstalled(true)
+            preferences.edit()
+                .remove(oldKey).apply()
+        }
+    }
+
+    val searchWidgetInstalled by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_search_widget_installed_2),
+        default = false,
+    )
 
     fun incrementNumTimesPrivateModeOpened() = numTimesPrivateModeOpened.increment()
 
@@ -1639,14 +1671,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false,
     )
 
-    /**
-     * Indicates if the Task Continuity enhancements are enabled.
-     */
-    var enableTaskContinuityEnhancements by booleanPreference(
-        key = appContext.getPreferenceKey(R.string.pref_key_enable_task_continuity),
-        default = true,
-    )
-
     /**
      * Indicates if the Unified Search feature should be visible.
      */
@@ -1681,21 +1705,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false,
     )
 
-    /**
-     * Indicates if juno onboarding feature is enabled.
-     */
-    val junoOnboardingEnabled: Boolean
-        get() = FxNimbus.features.junoOnboarding.value().enabled
-
     /**
      * Returns whether juno onboarding should be shown to the user.
+     *
+     * @param hasUserBeenOnboarded Boolean to indicate whether the user has been onboarded.
      * @param isLauncherIntent Boolean to indicate whether the app was launched on tapping on the
      * app icon.
      */
     fun shouldShowJunoOnboarding(hasUserBeenOnboarded: Boolean, isLauncherIntent: Boolean): Boolean {
         return if (!hasUserBeenOnboarded && isLauncherIntent) {
             FxNimbus.features.junoOnboarding.recordExposure()
-            junoOnboardingEnabled
+            true
         } else {
             false
         }
@@ -1723,6 +1743,22 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false,
     )
 
+    /**
+     * Indicates if the review quality check CFR should be displayed to the user.
+     */
+    var shouldShowReviewQualityCheckCFR by booleanPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_should_show_review_quality_cfr),
+        default = true,
+    )
+
+    /**
+     * Time in milliseconds since the user first opted in the review quality check feature.
+     */
+    var reviewQualityCheckOptInTimeInMillis by longPreference(
+        appContext.getPreferenceKey(R.string.pref_key_should_show_review_quality_opt_in_time),
+        default = 0L,
+    )
+
     /**
      * Get the current mode for how https-only is enabled.
      */
@@ -1822,6 +1858,14 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = FxNimbus.features.shoppingExperience.value().enabled,
     )
 
+    /**
+     * Indicates if Firefox translations are enabled.
+     */
+    var enableTranslations by booleanPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_enable_translations),
+        default = false,
+    )
+
     /**
      * Adjust Activated User sent
      */
@@ -1865,4 +1909,34 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         appContext.getPreferenceKey(R.string.pref_key_hidden_engines_restored),
         default = false,
     )
+
+    /**
+     * Indicates if Firefox Suggest is enabled.
+     */
+    var enableFxSuggest by lazyFeatureFlagPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_enable_fxsuggest),
+        default = { FxNimbus.features.fxSuggest.value().enabled },
+        featureFlag = FeatureFlags.fxSuggest,
+    )
+
+    /**
+     * Indicates if the user has chosen to show sponsored search suggestions in the awesomebar.
+     * The default value is computed lazily, and based on whether Firefox Suggest is enabled.
+     */
+    var showSponsoredSuggestions by lazyFeatureFlagPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_show_sponsored_suggestions),
+        default = { enableFxSuggest },
+        featureFlag = FeatureFlags.fxSuggest,
+    )
+
+    /**
+     * Indicates if the user has chosen to show search suggestions for web content in the
+     * awesomebar. The default value is computed lazily, and based on whether Firefox Suggest
+     * is enabled.
+     */
+    var showNonSponsoredSuggestions by lazyFeatureFlagPreference(
+        key = appContext.getPreferenceKey(R.string.pref_key_show_nonsponsored_suggestions),
+        default = { enableFxSuggest },
+        featureFlag = FeatureFlags.fxSuggest,
+    )
 }
diff --git a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
index 4656b04d5..658065e1b 100644
--- a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
+++ b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
@@ -21,6 +21,7 @@ import androidx.annotation.Dimension.Companion.DP
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.toBitmap
+import org.mozilla.fenix.GleanMetrics.Metrics
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.R
@@ -37,11 +38,13 @@ class SearchWidgetProvider : AppWidgetProvider() {
     // The existing name replicates the name and package we used in Fennec.
 
     override fun onEnabled(context: Context) {
-        context.settings().addSearchWidgetInstalled(1)
+        context.settings().setSearchWidgetInstalled(true)
+        Metrics.searchWidgetInstalled.set(true)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        context.settings().addSearchWidgetInstalled(-appWidgetIds.size)
+    override fun onDisabled(context: Context) {
+        context.settings().setSearchWidgetInstalled(false)
+        Metrics.searchWidgetInstalled.set(false)
     }
 
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
diff --git a/app/src/main/res/drawable-hdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-hdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..9f6b45029
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-mdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-mdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..8857aa7e4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night-hdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-night-hdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..9962a5a3b
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night-mdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-night-mdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..f49811704
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night-xhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-night-xhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..ae8a6a466
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-night-xxhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..92c6f7c17
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-night-xxxhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..0620484d2
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-night/shopping_no_analysis.webp b/app/src/main/res/drawable-night/shopping_no_analysis.webp
new file mode 100644
index 000000000..f49811704
Binary files /dev/null and b/app/src/main/res/drawable-night/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-xhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..df6fcb990
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-xxhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..9d1b79d62
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/shopping_no_analysis.webp b/app/src/main/res/drawable-xxxhdpi/shopping_no_analysis.webp
new file mode 100644
index 000000000..6aa8878bd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/drawable/animated_splash_screen.xml b/app/src/main/res/drawable/animated_splash_screen.xml
index 4e96325db..e2b7ead51 100644
--- a/app/src/main/res/drawable/animated_splash_screen.xml
+++ b/app/src/main/res/drawable/animated_splash_screen.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt" >
     <aapt:attr name="android:drawable">
diff --git a/app/src/main/res/drawable/cfr_background_gradient.xml b/app/src/main/res/drawable/cfr_background_gradient.xml
deleted file mode 100644
index b4dff6e79..000000000
--- a/app/src/main/res/drawable/cfr_background_gradient.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-    <gradient
-            android:angle="45"
-            android:endColor="@color/fx_mobile_layer_color_gradient_end"
-            android:startColor="@color/fx_mobile_layer_color_gradient_start"
-            android:type="linear" />
-    <size
-            android:width="256dp"
-            android:height="152dp" />
-    <corners
-            android:bottomLeftRadius="8dp"
-            android:bottomRightRadius="8dp"
-            android:topLeftRadius="8dp"
-            android:topRightRadius="8dp" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_shopping_cart.xml b/app/src/main/res/drawable/ic_shopping_cart.xml
deleted file mode 100644
index ff274f022..000000000
--- a/app/src/main/res/drawable/ic_shopping_cart.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M4,4h16v16h-16z" />
-        <path
-            android:fillColor="?attr/textPrimary"
-            android:pathData="M19.775,8.509C19.83,8.308 19.788,8.094 19.662,7.929C19.536,7.764 19.341,7.667 19.133,7.667H7.698C7.618,7.668 7.549,7.612 7.533,7.533L7.152,5.72C6.938,4.72 6.056,4.005 5.034,4C4.574,4 4.201,4.373 4.201,4.833C4.201,5.294 4.574,5.667 5.034,5.667C5.271,5.668 5.475,5.835 5.523,6.067L7.633,16.113C7.743,16.628 8.036,17.085 8.458,17.4C8.499,17.43 8.523,17.477 8.525,17.528C8.526,17.578 8.505,17.626 8.467,17.659C7.943,18.113 7.853,18.892 8.261,19.452C8.669,20.013 9.438,20.167 10.03,19.808C10.623,19.449 10.842,18.695 10.533,18.075C10.507,18.023 10.51,17.962 10.541,17.913C10.571,17.864 10.625,17.834 10.683,17.834H14.663C14.72,17.834 14.774,17.864 14.804,17.913C14.835,17.962 14.838,18.023 14.812,18.075C14.607,18.488 14.63,18.977 14.873,19.369C15.116,19.761 15.544,20 16.005,20C16.468,20 16.898,19.76 17.14,19.366C17.383,18.972 17.404,18.48 17.195,18.067C17.17,18.017 17.173,17.958 17.202,17.91C17.231,17.862 17.283,17.833 17.339,17.833C17.799,17.833 18.172,17.46 18.172,17C18.172,16.54 17.799,16.167 17.339,16.167H9.754C9.518,16.166 9.314,16.001 9.265,15.77L9.145,15.2C9.135,15.151 9.148,15.1 9.18,15.061C9.211,15.023 9.259,15 9.309,15H16.478C17.38,15 18.17,14.396 18.407,13.526L19.775,8.509Z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/rounded_gray_corners.xml b/app/src/main/res/drawable/rounded_gray_corners.xml
deleted file mode 100644
index 435ce917a..000000000
--- a/app/src/main/res/drawable/rounded_gray_corners.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/fx_mobile_action_color_secondary" />
-    <corners android:radius="@dimen/tab_corner_radius"/>
-</shape>
diff --git a/app/src/main/res/drawable/shopping_no_analysis.webp b/app/src/main/res/drawable/shopping_no_analysis.webp
new file mode 100644
index 000000000..8857aa7e4
Binary files /dev/null and b/app/src/main/res/drawable/shopping_no_analysis.webp differ
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 084104c65..6e2866d59 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -178,6 +178,7 @@
             android:id="@+id/tab_button"
             android:layout_width="48dp"
             android:layout_height="48dp"
+            android:clipChildren="false"
             app:layout_constraintTop_toTopOf="@id/bottom_bar"
             app:layout_constraintBottom_toBottomOf="@id/bottom_bar"
             app:layout_constraintEnd_toStartOf="@+id/menuButton"
diff --git a/app/src/main/res/layout/layout_percentage_seek_bar.xml b/app/src/main/res/layout/layout_percentage_seek_bar.xml
index effe3780e..79b6d5c44 100644
--- a/app/src/main/res/layout/layout_percentage_seek_bar.xml
+++ b/app/src/main/res/layout/layout_percentage_seek_bar.xml
@@ -41,7 +41,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/top_bar_alignment_margin_start"
-        android:paddingEnd="60dp"
+        android:paddingEnd="80dp"
         app:layout_constraintBottom_toBottomOf="@+id/seekbar_value"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/pbm_shortcut_popup.xml b/app/src/main/res/layout/pbm_shortcut_popup.xml
deleted file mode 100644
index 3731cfd71..000000000
--- a/app/src/main/res/layout/pbm_shortcut_popup.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:layout_width="@dimen/cfr_triangle_width"
-        android:layout_height="@dimen/cfr_triangle_height"
-        android:layout_gravity="end"
-        android:layout_marginEnd="@dimen/cfr_triangle_margin_edge"
-        android:importantForAccessibility="no"
-        app:srcCompat="@drawable/ic_cfr_triangle"
-        app:tint="@color/fx_mobile_layer_color_gradient_end" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/cfr_background_gradient">
-
-        <TextView
-            android:id="@+id/cfr_message"
-            style="@style/Header16TextStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="32dp"
-            android:lineSpacingExtra="2dp"
-            android:text="@string/private_mode_cfr_message_2"
-            android:textColor="@color/fx_mobile_text_color_oncolor_primary"
-            app:layout_constraintBottom_toTopOf="@id/cfr_pos_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/cfr_pos_button"
-            style="@style/NeutralButton"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/rounded_gray_corners"
-            android:text="@string/private_mode_cfr_pos_button_text"
-            android:textAllCaps="false"
-            android:textColor="@color/photonDarkGrey50"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toTopOf="@id/cfr_neg_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cfr_message" />
-
-        <Button
-            android:id="@+id/cfr_neg_button"
-            style="@style/NeutralButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/cfr_neg_button_text"
-            android:textAllCaps="false"
-            android:textColor="@color/fx_mobile_text_color_oncolor_primary"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cfr_pos_button" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index 874356d71..a1c1fb7ae 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -59,6 +59,7 @@
         android:ellipsize="end"
         android:textColor="@color/fx_mobile_text_color_primary"
         android:textSize="16sp"
+        android:letterSpacing="0.03"
         android:maxLines="2"
         tools:text="Firefox"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
@@ -78,6 +79,7 @@
         android:lines="1"
         android:textColor="@color/fx_mobile_text_color_secondary"
         android:textSize="14sp"
+        android:letterSpacing="0.035"
         tools:text="firefox.com"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
         app:layout_constraintStart_toEndOf="@id/mozac_browser_tabstray_card"
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index a297ac7e4..943fd9772 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -65,6 +65,19 @@
        ስለግል አሰሳ የተለመዱ አፈ ታሪኮች
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">በዚህ መሳሪያ ላይ ምንም ዱካ አትተዉ</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">ሁሉንም የግል መስኮቶችዎን ሲዘጉ %1$s ኩኪዎችዎን፣ ታሪክዎን እና የድረ-ገፅ ውሂብዎን ይሰርዛል። %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">የእኔን እንቅስቃሴ ማን ማየት ይችላል?</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">አንዴ መታ በማድረግ ቀጣዩን የግል ትር አስጀምር።</string>
@@ -87,6 +100,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">ስለ አጠቃላይ የኩኪ ጥበቃ ይወቁ</string>
 
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">አዲስ የግል ክፍለ ጊዜ ለመጀመር እዚህ ይንኩ። ታሪክዎን ፣ ኩኪዎችን - ሁሉንም ነገር ይሰርዙ።</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">የካሜራ ፈቃድ ያስፈልጋል። ወደ አንድሮይድ ቅንብሮች ይሂዱ፣ ፈቃዶችን ይንኩ እና ፍቀድን ይንኩ።</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -220,6 +238,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">የመነሻ ማያ ገጽ</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">የአሰሳ ታሪክን አጥፋ</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">የተመረጠ ቋንቋ</string>
@@ -295,16 +316,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">አሁን አይሆንም</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%sን ነባሪ አሳሽዎ ያድርጉ</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">ፋየርፎክስን ነባሪ አሳሽዎ ያድርጉ</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ሰዎችን ከትርፍ በላይ ያስቀምጣቸዋል እና ድረ-ገጽ ተሻጋሪ መከታተያዎችን በማገድ የእርስዎን ግላዊነት ይጠብቃል።\n\nበእኛ %2$s ውስጥ የበለጠ ይወቁ።</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">ፋየርፎክስ ሰዎችን ከትርፍ በላይ ያስቀድማል እና ድረ-ገጽ ተሻጋሪ መከታተያዎችን በማገድ የእርስዎን ግላዊነት ይጠብቃል።\n\nበግላዊነት ማስታወቂያችን ውስጥ የበለጠ ይረዱ።</string>
@@ -324,15 +338,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">ይግቡ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">አሁን አይሆንም</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">ማሳወቂያዎች በ%s የበለጠ እንዲከውኑ ያግዝዎታል</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">ማሳወቂያዎች በፋየርፎክስ የበለጠ እንዲሰሩ ያግዝዎታል</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">በመሳሪያዎች መካከል ትሮችን ይላኩ፣ ውርዶችን ያስተዳድሩ እና %sን የበለጠ ለመጠቀም ምክሮችን ያግኙ።</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">በመሳሪያዎች መካከል ትሮችን ይላኩ፣ ውርዶችን ያስተዳድሩ እና ከፋየርፎክስ የበለጠ ለመጠቀም ምክሮችን ያግኙ።</string>
@@ -341,6 +349,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">አሁን አይሆንም</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">የFirefox መፈለጊያ መግብርን ይሞክሩ</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Firefox በመነሻ ማያ ገፅ ሲኖር፣ ድረ-ገፅ ተሻጋሪ መከታተያወችን የሚያግድ ፣ ግላዊነትን የሚያስቀድም አሳሽ በቀላሉ ማግኘት ይችላሉ።</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">የFirefox መግብርን ያክሉ</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">አሁን አይሆንም</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">አዲስ %1$s ትር ክፈት</string>
@@ -475,11 +495,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">ተደራሽነት</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">ብጁ የፋየርፎክስ መለያ አገልጋይ</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">ብጁ የፋየርፎክስ መለያ አገልጋይ</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">ብጁ የMozilla መለያ አገልጋይ</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">ብጁ የማመሳሰል አገልጋይ</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">የፋየርፎክስ መለያ/አመሳስል አገልጋይ ተቀይሯል። ለውጦችን ለማካተት መተግበሪያውን በማቆም ላይ…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">የፋየርፎክስ መለያ/አመሳስል አገልጋይ ተቀይሯል። ለውጦችን ለማካተት መተግበሪያውን በማቆም ላይ…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">የMozilla መለያ/አመሳስል አገልጋይ ተቀይሯል። ለውጦችን ለመተግበር መተግበሪያውን በማቆም ላይ…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">መለያ</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -495,7 +519,9 @@
     <!-- 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">የፋየርፎክስ መለያ</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">የፋየርፎክስ መለያ</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">ማመሳሰልን ለመቀጠል እንደገና ይገናኙ</string>
     <!-- Preference for language -->
@@ -526,6 +552,13 @@
     <string name="preferences_account_settings">የመለያ ቅንብሮች</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">ራስ-አጠናቅቅ</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">ከስፖንሰሮች የተሰጡ አስተያየቶች</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 -->
@@ -627,9 +660,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">ተጨማሪ አይደገፍም</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">ተጨማሪ አይደገፍም</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">ተጨማሪ አስቀድሞ ተጭኗል</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">ተጨማሪ አስቀድሞ ተጭኗል</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">ተጨማሪዎች ለጊዜው ተሰናክለዋል</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">አንድ ወይም ከዚያ በላይ ተጨማሪዎች መስራት አቁመዋል፣ይህም ስርዓትዎ ያልተረጋጋ እንዲሆን አድርጎታል። %1$s ተጨማሪውን እንደገና ለማስጀመር ሞክሯል አልተሳካም።\n\nተጨማሪዎች በአሁኑ ክፍለ ጊዜዎ እንደገና አይጀመሩም።\n\nተጨማሪዎችን ማስወገድ ወይም ማሰናከል ይህንን ችግር ሊፈታው ይችላል።</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">ተጨማሪዎችን እንደገና ለማስጀመር ይሞክሩ</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">ተጨማሪዎችን በማሰናከል ይቀጥሉ</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -1307,6 +1350,8 @@
     <string name="snackbar_private_tab_closed">የግል ትር ተዘግቷል</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">የግል ትሮች ተዘግተዋል</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">የግል አሰሳ ውሂብ ተሰርዟል</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ቀልብስ</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -2118,6 +2163,150 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">ወደ ቅንብሮች ይሂዱ</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">የግምገማ አረጋጋጭ</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">አስተማማኝ ግምገማዎች</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">አስተማማኝ እና የማይታመኑ ግምገማዎች ድብልቅ</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">የማይታመኑ ግምገማዎች</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">እነዚህ ግምገማዎች ምን ያህል አስተማማኝ ናቸው?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">የተስተካከለ ደረጃ</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">የማይታመኑ ግምገማዎች ተወግደዋል</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">ከቅርብ ግዜ ግምገማዎች ዋና ዋናዎቹ</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">የግምገማ ጥራትን እንዴት እንደምንወስን</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">የምርት ግምገማዎችን አስተማማኝነት ለማረጋገጥ AI ቴክኖሎጂን ከ%s በMozilla እንጠቀማለን። ይህ እርስዎ የግምገማ ጥራትን ብቻ እንጂ የምርት ጥራትን እንዲገመግሙ አይረዳወትም።</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[የእያንዳንዱን ምርት ግምገማዎች በ<b>ፊደል ደረጃ</b> ከሀ እስከ ረ እንመድባለን።]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">አስተማማኝ ግምገማዎች። ግምገማዎቹ ሐቀኛ፣ አድልዎ የለሽ ግምገማዎችን ትተው ከወጡ እውነተኛ ደንበኞች ሊሆኑ እንደሚችሉ እናምናለን።</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">ግምገማዎቹ አስተማማኝ ናቸው ብለን እናምናለን።</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">አስተማማኝ እና የማይታመኑ ግምገማዎች ድብልቅ እንዳለ እናምናለን።</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">የማይታመኑ ግምገማዎች። ግምገማዎቹ የሐሰት ወይም አድሏዊ ከሆኑ ገምጋሚዎች ናቸው ብለን እናምናለን።</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">ግምገማዎቹ የማይታመኑ ናቸው ብለን እናምናለን።</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[የ<b>የተስተካከለ ደረጃ</b> አስተማማኝ ናቸው ብለን ባመንባቸው ግምገማዎች ላይ ብቻ የተመሰረተ ነው።]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<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">%s በሞዚላ እንዴት የግምገማ ጥራት እንደሚወስን</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">ቅንብሮች</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">በግምገማ አረጋጋጭ ውስጥ ማስታወቂያዎችን አሳይ</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">የበለጠ ለማወቅ</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">የግምገማ አረጋጋጭን ያጥፉ</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">ሊታሰብበት የሚገባ ተጨማሪ</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">ማስታወቂያ በ%s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">የግምገማ አረጋጋጭ የተጎላበተው በ%s ነው።</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">የግምገማ አረጋጋጭ የተጎላበተው በ%s ነው</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s በሞዚላ</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">አሁን ያረጋግጡ</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">እስካሁን በቂ ግምገማዎች የሉም</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">ይህ ምርት ተጨማሪ ግምገማዎች ሲኖረው ጥራታቸውን ማረጋገጥ እንችላለን።</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">ምርቱ አይገኝም</string>
+
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">ይህ ምርት ወደ ክምችት እንደተመለሰ ካዩ፣ ሪፖርት ያድርጉት እና ግምገማዎቹን ለማየት እንሰራለን።</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">ይህ ምርት ወደ ክምችት መመለሱን ሪፖርት ያድርጉ</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">የግምገማ ጥራት በመፈተሽ ላይ</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">የግምገማ ጥራት በመፈተሽ ላይ</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">ይህ ወደ 60 ሰከንድ ሊወስድ ይችላል።</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">ሪፖርት ስላደረጉ እናመሰግናለን!</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">እነዚህን ግምገማዎች ማረጋገጥ አንችልም</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">መረጃ በቅርቡ ይመጣል</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">በ24 ሰዓታት ውስጥ ስለዚህ ምርት ግምገማዎች መረጃ ሊኖረን ይገባል። እባክዎን ተመልሰው ያረጋግጡ።</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">ትንታኔው ወቅታዊ ነው</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">ገባኝ</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">አሁን ምንም መረጃ የለም</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">ችግሩን ለመፍታት እየሰራን ነው። እባክዎ በቅርቡ ተመልሰው ያረጋግጡ።</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">ምንም የአውታረ መረብ ግንኙነት የለም</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">የአውታረ መረብ ግንኙነትዎን ያረጋግጡ እና ከዚያ ገጹን እንደገና ለመጫን ይሞክሩ።</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">ስለእነዚህ ግምገማዎች እስካሁን ምንም መረጃ የለም</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">የዚህ ምርት ግምገማዎች አስተማማኝ መሆናቸውን ለማወቅ የግምገማውን ጥራት ያረጋግጡ። ወደ 60 ሰከንድ ብቻ ነው የሚወስደው።</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">የግምገማውን ጥራት ያረጋግጡ</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">የበለጠ ለማወቅ</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">የግላዊነት ፖሊሲ</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">የአጠቃቀም መመሪያ</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">አዎ፣ ይሞክሩት</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">አሁን አይሆንም</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">ከመግዛትዎ በፊት — የዚህን ምርት ግምገማዎች ማመን እንደሚችሉ ይወቁ።</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">የግምገማ አረጋጋጭን ይሞክሩት</string>
+
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">እነዚህ ግምገማዎች አስተማማኝ ናቸው? የተስተካከለ ደረጃን ለማየት አሁን ያረጋግጡ።</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">የግምገማ አረጋጋጭን ይክፈቱ</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">የግምገማ አረጋጋጭን ይክፈቱ</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">የግምገማ አረጋጋጭን ዝጋ</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s ከ5 ኮከቦች</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">ያነሰ አሳይ</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">ተጨማሪ አሳይ</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">ጥራት</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">ዋጋ</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">ማጓጓዣ</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">ማሸጊያ እና ገፅታ</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">ተወዳዳሪነት</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">ሰብስብ</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 93951fd6a..d3482d7c1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -322,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Не зараз</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Зрабіце %s сваім паўсядзённым браўзерам</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Зрабіце Firefox сваім паўсядзённым браўзерам</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ставіць людзей вышэй за прыбытак і абараняе вашу прыватнасць, блакуючы міжсайтавыя трэкеры.\n\nДаведайцеся больш у нашым %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ставіць людзей вышэй за прыбытак і абараняе вашу прыватнасць, блакуючы міжсайтавыя трэкеры.\n\nДаведайцеся больш у нашым паведамленні аб прыватнасці.</string>
@@ -350,16 +343,10 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Увайсці</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Не зараз</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Апавяшчэнні дапамогуць вам зрабіць больш з %s</string>
 
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Апавяшчэнні дапамогуць вам зрабіць больш з Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Адпраўляйце карткі паміж прыладамі, кіруйце сцягваннямі і атрымлівайце парады, як максімальна выкарыстоўваць %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Адпраўляйце карткі паміж прыладамі, кіруйце сцягваннямі і атрымлівайце парады, як максімальна выкарыстоўваць Firefox.</string>
@@ -514,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Даступнасць</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Уласны сервер уліковых запісаў Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Уласны сервер уліковых запісаў Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Уласны сервер уліковых запісаў Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Уласны сервер сінхранізацыі</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Сервер уліковага запісу Firefox/сінхранізацыі зменены. Выхад з праграмы, каб прымяніць змены…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Сервер уліковага запісу Firefox/сінхранізацыі зменены. Выхад з праграмы, каб прымяніць змены…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Сервер уліковых запісаў Mozilla/сінхранізацыі зменены. Выхад з праграмы, каб прымяніць змены…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Уліковы запіс</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -535,7 +526,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Увайсці, каб сінхранізаваць карткі, закладкі, паролі і іншае.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Уліковы запіс Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Уліковы запіс Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Падключыцеся, каб аднавіць сінхранізацыю</string>
     <!-- Preference for language -->
@@ -547,7 +540,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Аддаленая адладка праз USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Паказаць пашукавікі</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Паказаць пашукавікі</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 -->
@@ -566,6 +559,16 @@
     <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 -->
@@ -668,9 +671,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Дадатак не падтрымліваецца</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Дадатак не падтрымліваецца</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Дадатак ужо ўсталяваны</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Дадатак ужо ўсталяваны</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Дадаткі часова адключаны</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Адзін ці некалькі дадаткаў перасталі працаваць, што зрабіла вашу сістэму нестабільнай. %1$s беспаспяхова спрабаваў перазапусціць дадатак(і).\n\nДадаткі не будуць перазапушчаны ў часе бягучага сеансу.\n\nВыдаленне або адключэнне дадаткаў можа вырашыць гэтую праблему.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Паспрабаваць перазапусціць дадаткі</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Працягнуць з адключанымі дадаткамі</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -685,6 +698,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Кіраванне ўліковым запісам</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Зменіць пароль, кіраваць зборам дадзеных або выдаліць свой уліковы запіс</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Сінхранізаваць</string>
     <!-- Preference category for sync -->
@@ -1961,7 +1976,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Дадаць</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Захаваць</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Захаваць</string>
 
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Змяніць</string>
@@ -2218,7 +2233,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Праверка водгукаў</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Праверка водгукаў</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Праверка водгукаў</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Надзейныя водгукі</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2238,17 +2255,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Мы выкарыстоўваем тэхналогію штучнага інтэлекту ад %s ад Mozilla для праверкі надзейнасці водгукаў на прадукцыю. Гэты аналіз дапаможа вам ацаніць толькі якасць водгуку, а не якасць прадукту.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Кожнаму водгуку на прадукт мы прысвойваем <b>літарную адзнаку</b> ад A да F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Кожнаму водгуку на прадукт мы прысвойваем <b>літарную адзнаку</b> ад A да F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Надзейныя водгукі. Мы лічым, што водгукі, хутчэй за ўсё, ад сапраўдных кліентаў, якія пакінулі сумленныя, непрадузятыя водгукі.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мы лічым, што водгукі надзейныя.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Мы лічым, што тут ёсць сумесь надзейных і ненадзейных водгукаў.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Ненадзейныя водгукі. Мы лічым, што агляды, хутчэй за ўсё, падробленыя або ад неаб\'ектыўных аглядальнікаў.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мы лічым, што водгукі ненадзейныя.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Скарэкціраваны рэйтынг</b> заснаваны толькі на водгуках, якія мы лічым надзейнымі.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Асноўныя моманты</b> з водгукаў пра %s за апошнія 80 дзён, якія мы лічым надзейнымі.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Асноўныя моманты</b> з водгукаў пра %s за апошнія 80 дзён, якія мы лічым надзейнымі.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Даведайцеся больш пра %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2258,7 +2279,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Паказваць рэкламу ў сродку праверкі водгукаў</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Вы будзеце час ад часу бачыць рэкламу адпаведных тавараў. Усе аб’явы павінны адпавядаць нашым стандартам якасці водгукаў. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Вы будзеце час ад часу бачыць рэкламу адпаведных тавараў. Усе аб’явы павінны адпавядаць нашым стандартам якасці водгукаў. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Вы будзеце час ад часу бачыць рэкламу адпаведных тавараў. Мы рэкламуем прадукты толькі з надзейнымі водгукамі. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Падрабязней</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2278,29 +2301,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Праверыць зараз</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Пакуль недастаткова водгукаў</string>
+    <string name="review_quality_check_no_reviews_warning_title">Пакуль недастаткова водгукаў</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Калі на гэты прадукт будзе больш водгукаў, мы зможам праверыць іх якасць.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Калі на гэты прадукт будзе больш водгукаў, мы зможам праверыць іх якасць.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Прадукт недаступны</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Калі вы ўбачыце гэты прадукт ізноў у наяўнасці, паведаміце нам пра гэта, і мы будзем правяраць водгукі.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Паведаміць, што гэты прадукт ізноў у наяўнасці</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Паведаміць, што гэты прадукт ізноў у наяўнасці</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Паведаміць, што прадукт ёсць у наяўнасці</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Праверка якасці водгукаў</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Праверка якасці водгукаў</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Праверка якасці водгукаў</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Праверка якасці водгукаў</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Гэта можа заняць каля 60 секунд.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Гэта можа заняць каля 60 секунд.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Дзякуй за паведамленне!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Мы павінны атрымаць інфармацыю аб водгуках аб гэтым прадукце на працягу 24 гадзін. Праверце зноў пазней.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Мы не можам праверыць гэтыя водгукі</string>
+    <string name="review_quality_check_not_analyzable_info_title">Мы не можам праверыць гэтыя водгукі</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">На жаль, мы не можам праверыць якасць водгукаў для некаторых відаў прадукцыі. Напрыклад, падарункавыя карты і струменевае відэа, музыка і гульні.</string>
+    <string name="review_quality_check_not_analyzable_info_body">На жаль, мы не можам праверыць якасць водгукаў для некаторых відаў прадукцыі. Напрыклад, падарункавыя карты і струменевае відэа, музыка і гульні.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Інфармацыя хутка будзе</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2310,19 +2335,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Зразумела</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Зараз інфармацыя адсутнічае</string>
+    <string name="review_quality_check_generic_error_title">Зараз інфармацыя адсутнічае</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Мы працуем над вырашэннем праблемы. Калі ласка, праверце пазней.</string>
+    <string name="review_quality_check_generic_error_body">Мы працуем над вырашэннем праблемы. Калі ласка, праверце пазней.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Няма падключэння да сеткі</string>
+    <string name="review_quality_check_no_connection_title">Няма падключэння да сеткі</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Праверце падключэнне да сеткі, потым паспрабуйце абнавіць старонку.</string>
+    <string name="review_quality_check_no_connection_body">Праверце падключэнне да сеткі, потым паспрабуйце абнавіць старонку.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Інфармацыі аб гэтых водгуках пакуль няма</string>
+    <string name="review_quality_check_no_analysis_title">Інфармацыі аб гэтых водгуках пакуль няма</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Каб даведацца, ці надзейныя водгукі аб гэтым прадукце, праверце якасць водгукаў. Гэта зойме ўсяго каля 60 секунд.</string>
+    <string name="review_quality_check_no_analysis_body">Каб даведацца, ці надзейныя водгукі аб гэтым прадукце, праверце якасць водгукаў. Гэта зойме ўсяго каля 60 секунд.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Праверыць якасць водгукаў</string>
+    <string name="review_quality_check_no_analysis_link">Праверыць якасць водгукаў</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Паспрабуйце наш надзейны даведнік па водгуках на прадукты</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2350,11 +2375,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Адкрыць сродак праверкі водгукаў</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Бэта</string>
+    <string name="review_quality_check_beta_flag">Бэта</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Адкрыць праверку якасці водгукаў</string>
+    <string name="review_quality_check_open_handle_content_description">Адкрыць сродак праверкі водгукаў</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Закрыць праверку якасці водгукаў</string>
+    <string name="review_quality_check_close_handle_content_description">Закрыць сродак праверкі водгукаў</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s з 5 зорак</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c117819d1..3cf536a4f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -65,6 +65,19 @@
     <string name="private_browsing_placeholder_description_2">El %1$s esborra el vostre historial de cerques i de navegació de les pestanyes privades quan les tanqueu o sortiu de l’aplicació. Malgrat que això no fa que sigueu anònim per als llocs web o per al vostre proveïdor de serveis d’Internet, és més fàcil mantenir en privat allò que feu en línia davant de qualsevol altra persona que utilitzi aquest dispositiu.</string>
     <string name="private_browsing_common_myths">Mites comuns sobre la navegació privada</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">No deixeu rastre en aquest dispositiu</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">El %1$s suprimeix les galetes, l’historial i les dades dels llocs en tancar totes les finestres privades. %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">Qui podria veure la meva activitat?</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">Obriu la següent pestanya privada amb un sol toc.</string>
@@ -87,6 +100,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Més informació sobre la protecció total de galetes</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">Toqueu aquí per començar una sessió privada nova. Suprimiu l’historial, les galetes... tot.</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">Es necessita accés a la càmera. Aneu als paràmetres de l’Android, toqueu els permisos i trieu permetre.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -225,6 +243,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla d’inici</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">Esborra l’historial de navegació</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Llengua seleccionada</string>
@@ -303,16 +324,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ara no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Feu que el %s sigui el vostre navegador per defecte.</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Feu que el Firefox sigui el vostre navegador per defecte</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">El %1$s prioritza les persones sobre els beneficis i defensa la vostra privadesa blocant els elements de seguiment entre llocs.\n\nTrobareu més informació en l’%2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">El Firefox prioritza les persones sobre els beneficis i defensa la vostra privadesa blocant els elements de seguiment entre llocs.\n\nTrobareu més informació en l’avís de privadesa.</string>
@@ -332,15 +346,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Inicia la sessió</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ara no</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Les notificacions us ajuden a fer més coses amb el %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Les notificacions us ajuden a fer més coses amb el Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Envieu pestanyes entre dispositius, gestioneu les baixades i obteniu consells per a treure el màxim profit del %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Envieu pestanyes entre dispositius, gestioneu les baixades i obteniu consells per a treure el màxim profit del Firefox.</string>
@@ -349,6 +357,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Ara no</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Proveu el giny de cerca del Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Amb el Firefox a la pantalla d’inici, podreu accedir fàcilment al navegador que prioritza la privadesa i que bloca els elements de seguiment entre llocs.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Afegeix el giny del Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ara no</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">Obre en una pestanya nova en %1$s</string>
@@ -484,11 +504,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilitat</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor de comptes del Firefox personalitzat</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de comptes del Firefox personalitzat</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor de comptes de Mozilla personalitzat</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor del Sync personalitzat</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">S’ha modificat el servidor de comptes del Firefox o del Sync. L’aplicació es tancarà per aplicar els canvis…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">S’ha modificat el servidor de comptes del Firefox o del Sync. L’aplicació es tancarà per aplicar els canvis…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">S’ha modificat el servidor de comptes de Mozilla o del Sync. L’aplicació es tancarà per aplicar els canvis…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Compte</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -504,7 +528,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Inicieu la sessió per sincronitzar pestanyes, adreces d’interès, contrasenyes i més.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Compte del Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Compte del Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Compte de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Torneu-vos a connectar per reprendre la sincronització</string>
     <!-- Preference for language -->
@@ -516,7 +542,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuració remota per USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Mostra els motors de cerca</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostra els motors de cerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostra suggeriments de cerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -536,6 +562,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Emplenament automàtic dels URL</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggeriments dels patrocinadors</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">Doneu suport al %1$s activant els suggeriments patrocinats ocasionals</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">Suggeriments del %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Obteniu suggeriments del web relacionats amb la vostra cerca</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Obre els enllaços en les aplicacions</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -635,13 +671,26 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">El complement no és compatible</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">El complement no és compatible</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">El complement ja està instal·lat</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">El complement ja està instal·lat</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Els complements s’han desactivat temporalment</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Un o més complements han deixat de funcionar, i això fa que el vostre sistema sigui inestable. El %1$s ha intentat reiniciar els complements sense èxit.\n\nEls complements no es reiniciaran durant la sessió actual.\n\nPodeu eliminar o desactivar complements per intentar solucionar el problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Prova de reiniciar els complements</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continua amb els complements desactivats</string>
 
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gestiona el compte</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Canvieu la contrasenya, gestioneu la recollida de dades o suprimiu el vostre compte</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronitza ara</string>
     <!-- Preference category for sync -->
@@ -1215,6 +1264,8 @@
     <string name="standard_snackbar_error_dismiss">Descarta</string>
     <!-- Text for error message when printing a page and it fails. -->
     <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">No s’ha pogut imprinir</string>
+    <!-- Text for error message when printing a page and it fails. -->
+    <string name="unable_to_print_page_error">No s’ha pogut imprimir aquesta pàgina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimeix</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
@@ -1310,6 +1361,8 @@
     <string name="snackbar_private_tab_closed">S’ha tancat la pestanya privada</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">S’han tancat les pestanyes privades</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">S’han suprimit les dades de navegació privada</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">DESFÉS</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1357,14 +1410,14 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d pestanyes</string>
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118">Historial de navegació i dades dels llocs</string>
+    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118" tools:ignore="UnusedResources">Historial de navegació i dades dels llocs</string>
     <!-- Title for the history item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_browsing_history_title">Historial de navegació</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d adreces</string>
     <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118">Galetes</string>
+    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118" tools:ignore="UnusedResources">Galetes</string>
     <!-- Title for the cookies and site data items in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_and_site_data">Galetes i dades dels llocs</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
@@ -1890,7 +1943,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Afegeix</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Desa</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Desa</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Edita</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -1918,6 +1971,12 @@
 
     <!-- Label for the TextField in which user enters custom search engine suggestion URL -->
     <string name="search_add_custom_engine_suggest_url_label">API de suggeriments de cerca (opcional)</string>
+    <!-- Placeholder text shown in the Search Suggestion String TextField before a user enters text -->
+    <string name="search_add_custom_engine_suggest_string_hint">URL de l’API de suggeriments de cerca</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example" formatted="false" moz:RemovedIn="118" tools:ignore="UnusedResources">Substituïu la consulta per «%s». Per exemple:\nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">Substituïu la consulta per «%s». Per exemple:\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">Desa</string>
 
@@ -2133,6 +2192,46 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ves als paràmetres</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de ressenyes</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificador de ressenyes</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Ressenyes fiables</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Barreja de ressenyes fiables i poc fiables</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Ressenyes poc fiables</string>
+
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Són fiables aquestes revisions?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Valoració ajustada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">S’han eliminat les ressenyes poc fiables</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Punts destacats de les ressenyes recents</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Com es determina la qualitat de la ressenya</string>
+
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrelles</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Mostra’n menys</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Mostra’n més</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Qualitat</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Preu</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Enviament</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalatge i aspecte</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitivitat</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">reduir</string>
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index 2117d4455..fa0c1b946 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -327,16 +327,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Micca subitu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Impiegate %s cum’è navigatore predefinitu</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Impiegate Firefox cum’è navigatore predefinitu</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s fà passà a ghjente nanzu à i prufiti è prutege a vostra vita privata blucchendu l’elementi intersiti di spiunagiu.\n\nSapene di più in a nostra %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox fà passà a ghjente nanzu à i prufiti è prutege a vostra vita privata blucchendu l’elementi intersiti di spiunagiu.\n\nSapene di più in a nostra dichjarazione di cunfidenzialità.</string>
@@ -356,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Cunnettesi</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Micca subitu</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">E nutificazioni vi aiutanu à fane di più cù %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">E nutificazioni vi aiutanu à fane di più cù Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Mandate l’unghjette trà i vostri apparechji, urganizate i scaricamenti è ricivete cunsiglii per sapè cumu ottene u più bonu di %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Mandate l’unghjette trà i vostri apparechji, urganizate i scaricamenti è ricivete cunsiglii per sapè cumu ottene u più bonu di Firefox.</string>
@@ -521,11 +508,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilità</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servitore persunalizatu di contu Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servitore persunalizatu di contu Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servitore persunalizatu di contu Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servitore persunalizatu di sincrunizazione</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Mudificazione di u servitore di contu o di sincrunizazione. Chjusura di l’appiecazione per piglià i cambiamenti in contu…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Mudificazione di u servitore di contu o di sincrunizazione. Chjusura di l’appiecazione per piglià i cambiamenti in contu…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servitore di contu o di sincrunizazione Mozilla mudificatu. Chjusura di l’appiecazione per piglià i cambiamenti in contu…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Contu</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -541,7 +532,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Cunnittitevi per sincrunizà unghjette, indette, parolle d’intesa è ancu di più</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Contu Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Contu Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Contu Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ricunnittitevi per cuntinuà a sincrunizazione</string>
     <!-- Preference for language -->
@@ -553,7 +546,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Spannatura alluntanata via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Affissà i mutori di ricerca</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Affissà i mutori di ricerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Affissà e sugestioni di ricerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -574,6 +567,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Compie autumaticamente l’indirizzi</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugestioni da i finanzieri</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">Sustene %1$s cù sugestioni finanziare occasiunale</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">Sugestioni da %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Ottene sugestioni da u web relative à a vostra ricerca</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Apre i liami in l’appiecazioni</string>
 
@@ -677,9 +680,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Stu modulu addiziunale ùn hè micca accettatu</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Stu modulu addiziunale ùn hè micca accettatu</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Stu modulu addiziunale hè dighjà installatu</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Stu modulu addiziunale hè dighjà installatu</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">I moduli addiziunali sò disattivati timpurariamente</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Qualchì modulu addiziunale hà fermatu di funziunà, rindendu u vostru sistema instabile. %1$s hà pruvatu, senza successu, di rilancialli.\n\nSti moduli addiziunale ùn seranu micca rilanciati durante a sessione attuale.\n\nCaccialli o disattivalli puderia currege stu prublema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Pruvà di rilancià i moduli</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Cuntinuà cù i moduli disattivati</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -694,6 +707,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Ghjestione di u contu</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambià a vostra parolla d’intesa, amministrà a culletta di dati o squassà u vostru contu</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincrunizà avà</string>
     <!-- Preference category for sync -->
@@ -1953,7 +1968,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Aghjunghje</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Arregistrà</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Arregistrà</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Mudificà</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2206,7 +2221,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verificadore d’avisu</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificadore d’avisu</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificadore d’avisu</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Avisi degni di cunfidenza</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2229,18 +2246,22 @@
     <string name="review_quality_check_explanation_body_reliability">Impieghemu a tecnolugia AI di %s da Mozilla per verificà s’è l’avisi nant’à i prudutti sò degni di cunfidenza. Què vi aiuterà à misurà a qualità di l’avisu, micca quella di u pruduttu.</string>
 
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Demu à ogni avisu di pruduttu un <b>lettera di rangu</b> da A fine à F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Demu à ogni avisu di pruduttu un <b>lettera di rangu</b> da A fine à F.]]></string>
 
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Avisi degni di cunfidenza. Cridemu chì l’avisi venenu sicuramente da clienti veri chì anu lasciatu avisi sinceri è imparziali.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Pensemu chì l’avisi sò di cunfidenza.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Cridemu chì ci hè un mischju d’avisi più o menu degni di cunfidenza.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Avisi micca degni di cunfidenza. Cridemu chì l’avisi sò sicuramente falsi o ch’elli venenu da persone partigiane.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Pensemu chì l’avisi ùn sò micca di cunfidenza.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>valutazione rettificata</b> si basa solu nant’à l’avisi chì no cridemu degni di cunfidenza.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[L’elementi <b>messi in lume</b> sò l’avisi %s durante l’ultimi 80 ghjorni chì no cridemu degni di cunfidenza.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[L’elementi <b>messi in lume</b> sò l’avisi %s durante l’ultimi 80 ghjorni chì no cridemu degni di cunfidenza.]]></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">Sapene di più nant’à %s.</string>
 
@@ -2252,7 +2273,9 @@
     <string name="review_quality_check_settings_recommended_products">Affissà publicità in u verificadore d’avisu</string>
 
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Viderete, di quandu in quandu, una publicità per un pruduttu pertinente. Tutte ste publicità devenu risponde à e norme di qualità per l’avisi. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Viderete, di quandu in quandu, una publicità per un pruduttu pertinente. Tutte ste publicità devenu risponde à e norme di qualità per l’avisi. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Viderete, di quandu in quandu, una publicità per un pruduttu pertinente. Femu a publicità per i prudutti solu quandu i so avisi sò di cunfidenza. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Sapene di più</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2273,29 +2296,31 @@
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Cuntrollà subitu</string>
 
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ùn ci hè ancu abbastanza avisi</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ùn ci hè ancu abbastanza avisi</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Quandu stu pruduttu averà d’altri avisi, puderemu cuntrollà a so qualità.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Quandu stu pruduttu averà d’altri avisi, puderemu cuntrollà a so qualità.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">U pruduttu ùn hè micca dispunibule</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">S’è vo fighjate chì stu pruduttu hè torna dispunibule, fatecilu sapè è cuntinueremu à cuntrollà l’avisi.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Fà sapè chì stu pruduttu hè torna dispunibule</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Fà sapè chì stu pruduttu hè torna dispunibule</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Signalà chì u pruduttu hè dispunibule</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Cuntrollà a qualità di l’avisi</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Cuntrollà a qualità di l’avisi</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Cuntrollà a qualità di l’avisi</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Cuntrollà a qualità di l’avisi</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">St’operazione puderià piglià 60 seconde</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">St’operazione puderià piglià 60 seconde</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Vi ringraziemu di u vostru signalamentu !</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Duveriamu avè l’infurmazioni nant’à l’avisi di stu pruduttu nanzu 24 ore. Ci vole à verificà dopu.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Ùn pudemu micca cuntrollà st’avisi</string>
+    <string name="review_quality_check_not_analyzable_info_title">Ùn pudemu micca cuntrollà st’avisi</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Per disgrazia, ùn pudemu micca cuntrollà a qualità di l’avisi per certi tipi di prudutti. Per indettu, e carte di rigalu, a diffusione di filmetti è di musica, è i ghjochi.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Per disgrazia, ùn pudemu micca cuntrollà a qualità di l’avisi per certi tipi di prudutti. Per indettu, e carte di rigalu, a diffusione di filmetti è di musica, è i ghjochi.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Infurmazione dispunibule frà pocu</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2305,19 +2330,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Ahju capitu</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Alcuna infurmazione dispunibule fine à quì</string>
+    <string name="review_quality_check_generic_error_title">Alcuna infurmazione dispunibule fine à quì</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Travagliemu per currege stu penseru. Ci vole à verificà ulteriurmente.</string>
+    <string name="review_quality_check_generic_error_body">Travagliemu per currege stu penseru. Ci vole à verificà ulteriurmente.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Alcuna cunnessione di reta</string>
+    <string name="review_quality_check_no_connection_title">Alcuna cunnessione di reta</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Verificate a vostra cunnessione di reta è pruvate di ricaricà a pagina.</string>
+    <string name="review_quality_check_no_connection_body">Verificate a vostra cunnessione di reta è pruvate di ricaricà a pagina.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Ùn ci hè ancu infurmazione nant’à st’avisi</string>
+    <string name="review_quality_check_no_analysis_title">Ùn ci hè ancu infurmazione nant’à st’avisi</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Per sapè s’è l’avisi di stu pruduttu sò degni di cunfidenza, cuntrollà a qualità di l’avisi. St’operazione piglia circa 60 seconde solu.</string>
+    <string name="review_quality_check_no_analysis_body">Per sapè s’è l’avisi di stu pruduttu sò degni di cunfidenza, cuntrollà a qualità di l’avisi. St’operazione piglia circa 60 seconde solu.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Cuntrollà a qualità di l’avisi</string>
+    <string name="review_quality_check_no_analysis_link">Cuntrollà a qualità di l’avisi</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Pruvate a nostra guida di cunfidenza nant’à l’avisi di prudutti</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2346,11 +2371,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Apre u verificadore d’avisu</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Apre u cuntrollu di qualità di l’avisi</string>
+    <string name="review_quality_check_open_handle_content_description">Apre u verificadore d’avisu</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Chjode u cuntrollu di qualità di l’avisi</string>
+    <string name="review_quality_check_close_handle_content_description">Chjode u verificadore d’avisu</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s stelle nant’à 5</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4c136e2fa..9b86fc72a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -329,16 +329,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Teď ne</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Používejte aplikaci %s jako svůj hlavní prohlížeč</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Používejte Firefox jako svůj hlavní prohlížeč</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s upřednostňuje lidi před ziskem a chrání vaše soukromí blokováním cross-site sledovacích prvků.\n\nZjistěte více v našich %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox upřednostňuje lidi před ziskem a chrání vaše soukromí blokováním cross-site sledovacích prvků.\n\nZjistěte více v našich zásadách ochrany osobních údajů.</string>
@@ -357,15 +350,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Přihlásit se</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Teď ne</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Oznámení vám pomohou s aplikací %s udělat více</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Oznámení vám pomohou s Firefoxem udělat více</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Posílejte si panely mezi zařízeními, spravujte stahování a získejte tipy, jak co nejlépe využít aplikaci %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Posílejte si panely mezi zařízeními, spravujte stahování a získejte tipy, jak co nejlépe Firefox využít.</string>
@@ -517,11 +504,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Přístupnost</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Vlastní server pro účet Firefoxu</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Vlastní server pro účet Firefoxu</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Vlastní server pro účet Mozilly</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Vlastní server pro synchronizaci</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Server pro účet Firefoxu nebo synchronizaci byl změněn. Pro aplikování změn se nyní aplikace ukončí…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Server pro účet Firefoxu nebo synchronizaci byl změněn. Pro aplikování změn se nyní aplikace ukončí…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Server pro účet Mozilly nebo synchronizaci byl změněn. Pro aplikování změn se nyní aplikace ukončí…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Účet</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -537,7 +528,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Pro synchronizaci svých panelů, záložek, hesel a dalších věcí se přihlaste.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Účet Firefoxu</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Účet Firefoxu</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Účet Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Pro spuštění synchronizace se znovu připojte</string>
     <!-- Preference for language -->
@@ -549,7 +542,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Vzdálené ladění pomocí USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Zobrazovat vyhledávače</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Zobrazovat vyhledávače</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Našeptávat dotazy pro vyhledávač</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -569,6 +562,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Automaticky doplňovat URL adresy</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Návrhy od sponzorů</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">Podpora aplikace %1$s občasnými sponzorovanými návrhy</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">Návrhy od aplikace %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Získat návrhy z webu související s vaším vyhledáváním</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Otevírat odkazy v aplikacích</string>
 
@@ -669,9 +672,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Doplněk není podporován</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Doplněk není podporován</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Doplněk je již nainstalován</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Doplněk je již nainstalován</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Doplňky jsou dočasně zakázány.</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Jeden nebo více doplňků přestalo fungovat a systém se tak stal nestabilním. %1$s se neúspěšně pokusil restartovat doplňky.\n\nDoplňky nebudou restartovány během vaší aktuální relace.\n\nOdstranění nebo zakázání doplňků může tento problém vyřešit.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Zkuste restartovat doplňky</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Pokračovat s vypnutými doplňky</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -686,6 +699,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Správa účtu</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Změňte své heslo, spravujte shromažďování údajů nebo smažte svůj účet</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronizovat</string>
     <!-- Preference category for sync -->
@@ -1955,7 +1970,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Přidat</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Uložit</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Uložit</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Upravit</string>
 
@@ -2207,7 +2222,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Kontrola recenzí</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontrola recenzí</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Kontrola recenzí</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Spolehlivé recenze</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2227,17 +2244,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Ke kontrole spolehlivosti recenzí produktů používáme technologii AI od společnosti %s od Mozilly. Analýza vám pomůže vyhodnotit pouze kvalitu recenzí, nikoli kvalitu produktu.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Recenzím každého produktu přidělujeme <b>známku písmenem</b> od A do F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Recenzím každého produktu přidělujeme <b>známku písmenem</b> od A do F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Spolehlivé recenze. Věříme, že recenze pocházejí pravděpodobně od skutečných zákazníků, kteří zanechali upřímné a nezaujaté recenze.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Věříme, že recenze jsou spolehlivé.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Věříme, že je zde směs spolehlivých a nespolehlivých recenzí.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Nespolehlivé recenze. Domníváme se, že tyto recenze jsou pravděpodobně falešné a nebo od zaujatých recenzentů.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Domníváme se, že recenze jsou nespolehlivé.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Upravené hodnocení</b> je založeno pouze na recenzích, které považujeme za spolehlivé.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Výběr</b> z recenzí %s za posledních 80 dní, které považujeme za spolehlivé.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Výběr</b> z recenzí %s za posledních 80 dní, které považujeme za spolehlivé.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zjistit více o %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2247,7 +2268,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Zobrazovat reklamy v kontrole recenzí</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Občas se vám zobrazí reklamy na příslušné produkty. Všechny reklamy musí splňovat naše standardy kvality recenzí. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Občas se vám zobrazí reklamy na příslušné produkty. Všechny reklamy musí splňovat naše standardy kvality recenzí. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Občas se vám zobrazí reklamy na relevantní produkty. Inzerujeme pouze produkty se spolehlivými recenzemi. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Zjistěte více</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2267,29 +2290,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Zkontrolovat</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Zatím nemá dostatek recenzí</string>
+    <string name="review_quality_check_no_reviews_warning_title">Zatím nemá dostatek recenzí</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Až bude mít tento produkt více recenzí, budeme moci zkontrolovat jejich kvalitu.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Až bude mít tento produkt více recenzí, budeme moci zkontrolovat jejich kvalitu.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt není k dispozici</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Pokud zjistíte, že je tento produkt opět skladem, nahlaste to a my se pokusíme recenze zkontrolovat.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Nahlaste, že je tento produkt opět skladem</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Nahlaste, že je tento produkt opět skladem</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Oznámit, že produkt je skladem</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontroluje se kvalita recenzí</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontroluje se kvalita recenzí</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontroluje se kvalita recenzí</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontroluje se kvalita recenzí</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Může to trvat asi 60 sekund.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Může to trvat asi 60 sekund.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Děkujeme za nahlášení!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Informace o hodnocení tohoto produktu bychom měli mít k dispozici do 24 hodin. Prosím, zkontrolujte to znovu.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Tyto recenze nemůžeme zkontrolovat</string>
+    <string name="review_quality_check_not_analyzable_info_title">Tyto recenze nemůžeme zkontrolovat</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Kvalitu recenzí některých typů produktů bohužel nemůžeme kontrolovat. Například dárkové karty a streamovaná videa, hudbu a hry.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Kvalitu recenzí některých typů produktů bohužel nemůžeme kontrolovat. Například dárkové karty a streamovaná videa, hudbu a hry.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informace již brzy</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2299,19 +2324,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Rozumím</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">V tuto chvíli nejsou k dispozici žádné informace</string>
+    <string name="review_quality_check_generic_error_title">V tuto chvíli nejsou k dispozici žádné informace</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Pracujeme na vyřešení problému. Zkuste to prosím později.</string>
+    <string name="review_quality_check_generic_error_body">Pracujeme na vyřešení problému. Zkuste to prosím později.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Žádné síťové připojení</string>
+    <string name="review_quality_check_no_connection_title">Žádné síťové připojení</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Zkontrolujte připojení k síti a zkuste stránku načíst znovu.</string>
+    <string name="review_quality_check_no_connection_body">Zkontrolujte připojení k síti a zkuste stránku načíst znovu.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Zatím žádné informace o těchto recenzích</string>
+    <string name="review_quality_check_no_analysis_title">Zatím žádné informace o těchto recenzích</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Chcete-li zjistit, zda jsou recenze tohoto produktu spolehlivé, zkontrolujte kvalitu recenzí. Zabere to jen asi 60 sekund.</string>
+    <string name="review_quality_check_no_analysis_body">Chcete-li zjistit, zda jsou recenze tohoto produktu spolehlivé, zkontrolujte kvalitu recenzí. Zabere to jen asi 60 sekund.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Zkontrolovat kvalitu recenzí</string>
+    <string name="review_quality_check_no_analysis_link">Zkontrolovat kvalitu recenzí</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Vyzkoušejte našeho důvěryhodného průvodce recenzemi produktů</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2339,11 +2364,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Otevřít kontrolu recenzí</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Otevřít kontrolu kvality recenzí</string>
+    <string name="review_quality_check_open_handle_content_description">Otevřít kontrolu recenzí</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Zavřít kontrolu kvality recenzí</string>
+    <string name="review_quality_check_close_handle_content_description">Zavřít kontrolu recenzí</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s z 5 hvězdiček</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index d5d2be1b3..bdba5f8ed 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -321,16 +321,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Nid nawr</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Gwnewch %s eich hoff borwr</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Gwnewch Firefox yn borwr i chi</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Mae %1$s yn rhoi pobl dros elw ac yn diogelu eich preifatrwydd drwy rwystro tracwyr traws-gwefan.\n\nDysgu rhagor yn ein %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Mae Firefox yn rhoi pobl o flaen elw ac yn diogelu eich preifatrwydd trwy rwystro tracwyr traws-gwefan.\n\nDysgwch ragor yn ein hysbysiad preifatrwydd.</string>
@@ -349,15 +342,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Mewngofnodi</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Nid nawr</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Mae hysbysiadau yn eich helpu i wneud mwy gyda %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Mae hysbysiadau yn eich helpu i wneud rhagor gyda Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Anfonwch dabiau rhwng dyfeisiau, rheoli llwytho a chael awgrymiadau ar sut i gael y gorau o %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Yn anfon tabiau rhwng dyfeisiau, rheoli llwythi, a chael awgrymiadau am sut i gael y gorau o Firefox.</string>
@@ -514,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Hygyrchedd</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Gweinydd Cyfrif Cyfaddas Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Gweinydd Cyfrif Cyfaddas Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Gweinydd cyfrif Mozilla cyfaddas</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Gweinydd Sync Cyfaddas</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Mae Cyfrif Firefox/gweinydd Sync wedi’i addasu. Yn gadael y rhaglen i osod y newidiadau…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Mae Cyfrif Firefox/gweinydd Sync wedi’i addasu. Yn gadael y rhaglen i osod y newidiadau…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mae eich cyfrif Mozilla/Gweinydd Sync wedi’i addasu. Wrthi’n gadael y rhaglen er mwyn gwneud newidiadau…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cyfrif</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -534,7 +525,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Mewngofnodwch i gydweddu tabiau, nodau tudalen, cyfrineiriau, a rhagor.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cyfrif Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Cyfrif Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Cyfrif Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ailgysylltu i ailddechrau cydweddu</string>
     <!-- Preference for language -->
@@ -546,7 +539,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Dadfygio pell drwy USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Dangos y peiriannau chwilio</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Dangos y peiriannau chwilio</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Dangos awgrymiadau chwilio</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -566,6 +559,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Awtogwblhau URLau</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Awgrymiadau gan noddwyr</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">Cefnogwch %1$s gydag awgrymiadau noddedig achlysurol</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">Awgrymiadau gan %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Cael awgrymiadau o’r we sy’n ymwneud â’ch chwilio</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Agor dolenni mewn apiau</string>
 
@@ -666,9 +669,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Nid yw’r ychwanegyn yn cael ei gefnogi</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Nid yw’r ychwanegyn yn cael ei gefnogi</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Mae’r ychwanegyn eisoes wedi’i osod</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Mae’r ychwanegyn eisoes wedi’i osod</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Mae ychwanegion wedi’u hanalluogi dros dro</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Rhoddodd un neu fwy o ategion y gorau i weithio, gan wneud eich system yn ansefydlog. Ceisiodd %1$s ailgychwyn yr ychwanegyn(ion) yn aflwyddiannus.\n\nNi fydd ychwanegion yn cael eu hailddechrau yn ystod eich sesiwn gyfredol.\n\nGallai dileu neu analluogi ychwanegion ddatrys y broblem hon.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Ceisiwch ailgychwyn ychwanegion</string>
+
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Parhau gydag ychwanegion wedi’u hanalluogi</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -684,6 +698,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Rheoli cyfrif</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Newidiwch eich cyfrinair, rheoli casglu data, neu ddileu eich cyfrif</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Cydweddu nawr</string>
     <!-- Preference category for sync -->
@@ -1935,7 +1951,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Ychwanegu</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Cadw</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Cadw</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Golygu</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2185,7 +2201,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Gwirydd adolygiadau</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Gwirydd adolygiadau</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Gwiriwr Adolygiadau</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Adolygiadau dibynadwy</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2205,17 +2223,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Rydym yn defnyddio technoleg AI o %s gan Mozilla i wirio dibynadwyedd adolygiadau cynnyrch. Bydd hyn dim ond yn eich helpu i asesu ansawdd adolygiad, nid ansawdd y cynnyrch.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Rydym yn gosod <b>gradd llythyren</b> o A i F i adolygiadau pob cynnyrch.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Rydym yn gosod <b>gradd llythyren</b> o A i F i adolygiadau pob cynnyrch.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Adolygiadau dibynadwy. Rydym yn credu fod yr adolygiadau’n debygol o fod gan gwsmeriaid go iawn sydd wedi gadael adolygiadau gonest, diduedd.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Credwn fod yr adolygiadau yn ddibynadwy.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Rydym yn credu fod yna gymysgedd o adolygiadau dibynadwy ac annibynadwy.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Adolygiadau annibynadwy. Rydym yn credu fod yr adolygiadau yn debygol o fod yn rhai ffug neu gan adolygwyr rhagfarnllyd.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Credwn fod yr adolygiadau’n annibynadwy.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Mae’r <b>gradd wedi’i addasu</b> yn seiliedig ar adolygiadau y credwn eu bod yn ddibynadwy yn unig.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Daw’r <b>Uchafbwyntiau</b> o adolygiadau %s o fewn yr 80 diwrnod diwethaf y credwn eu bod yn ddibynadwy.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Daw’r <b>Uchafbwyntiau</b> o adolygiadau %s o fewn yr 80 diwrnod diwethaf y credwn eu bod yn ddibynadwy.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Dysgwch ragor am %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2225,7 +2247,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Dangos hysbysebion yn y gwiriwr adolygiadau</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Fe welwch hysbysebion achlysurol ar gyfer cynnyrch perthnasol. Rhaid i bob hysbyseb fodloni ein safonau ansawdd adolygiadau. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Fe welwch hysbysebion achlysurol ar gyfer cynnyrch perthnasol. Rhaid i bob hysbyseb fodloni ein safonau ansawdd adolygiadau. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Fe welwch hysbysebion achlysurol ar gyfer cynhyrchion perthnasol. Dim ond gydag adolygiadau dibynadwy yr ydym yn hysbysebu cynhyrchion. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Dysgu rhagor</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2235,7 +2259,9 @@
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Hysbyseb gan %s</string>
     <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
-    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources">Mae’r gwiriwr adolygiadau yn cael ei bweru gan %s.</string>
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Mae’r gwiriwr adolygiadau yn cael ei bweru gan %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Mae’r gwiriwr adolygiadau yn cael ei bweru gan %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s gan Mozilla</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2243,29 +2269,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Gwirio nawr</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Dim digon o adolygiadau eto</string>
+    <string name="review_quality_check_no_reviews_warning_title">Dim digon o adolygiadau eto</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Pan fydd gan y cynnyrch hwn fwy o adolygiadau, byddwn yn gallu gwirio eu hansawdd.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Pan fydd gan y cynnyrch hwn fwy o adolygiadau, byddwn yn gallu gwirio eu hansawdd.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Nid yw’r cynnyrch ar gael</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Os ydych yn gweld fod y cynnyrch hwn nôl mewn stoc, rhowch wybod i ni ac fe wnawn ni ddiweddaru’r dadansoddiad.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Adrodd fod y cynnyrch hwn nôl mewn stoc</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Adrodd fod y cynnyrch hwn nôl mewn stoc</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Adrodd fod cynnyrch mewn stoc</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Gwirio ansawdd adolygiadau</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Gwirio ansawdd adolygiadau</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Gwirio ansawdd adolygiadau</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Gwirio ansawdd adolygiadau</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Gall hyn gymryd tua 60 eiliad.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Gall hyn gymryd tua 60 eiliad.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Diolch am adrodd!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Dylai fod gennym dadansoddiad wedi’i ddiweddaru o fewn 24 awr. Dewch nôl i weld.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Methu gwirio’r adolygiadau hyn</string>
+    <string name="review_quality_check_not_analyzable_info_title">Methu gwirio’r adolygiadau hyn</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Yn anffodus, ni allwn wirio ansawdd adolygu ar gyfer rhai mathau o gynnyrch. Er enghraifft, cardiau rhodd a ffrydio fideo, cerddoriaeth a gemau.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Yn anffodus, ni allwn wirio ansawdd adolygu ar gyfer rhai mathau o gynnyrch. Er enghraifft, cardiau rhodd a ffrydio fideo, cerddoriaeth a gemau.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Gwybodaeth yn dod cyn hir</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2275,19 +2303,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Iawn</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Dim gwybodaeth ar gael ar hyn o bryd</string>
+    <string name="review_quality_check_generic_error_title">Dim gwybodaeth ar gael ar hyn o bryd</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Rydym yn gweithio i ddatrys y mater. Dewch nôl cyn bo hir.</string>
+    <string name="review_quality_check_generic_error_body">Rydym yn gweithio i ddatrys y mater. Dewch nôl cyn bo hir.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Dim cysylltiad rhwydwaith</string>
+    <string name="review_quality_check_no_connection_title">Dim cysylltiad rhwydwaith</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Gwiriwch eich cysylltiad rhwydwaith ac yna ceisiwch ail-lwytho’r dudalen.</string>
+    <string name="review_quality_check_no_connection_body">Gwiriwch eich cysylltiad rhwydwaith ac yna ceisiwch ail-lwytho’r dudalen.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Dim gwybodaeth am yr adolygiadau hyn eto</string>
+    <string name="review_quality_check_no_analysis_title">Dim gwybodaeth am yr adolygiadau hyn eto</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">I wybod a yw adolygiadau’r cynnyrch hwn yn ddibynadwy, gwiriwch ansawdd yr adolygiadau. Dim ond tua 60 eiliad y mae’n ei gymryd.</string>
+    <string name="review_quality_check_no_analysis_body">I wybod a yw adolygiadau’r cynnyrch hwn yn ddibynadwy, gwiriwch ansawdd yr adolygiadau. Dim ond tua 60 eiliad y mae’n ei gymryd.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Gwirio ansawdd yr adolygiad</string>
+    <string name="review_quality_check_no_analysis_link">Gwirio ansawdd yr adolygiad</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Rhowch gynnig ar ein canllaw dibynadwy i adolygiadau cynnyrch</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2315,11 +2343,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Agor y gwiriwr adolygiadau</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Agor y gwiriwr ansawdd adolygiadau</string>
+    <string name="review_quality_check_open_handle_content_description">Agor y gwiriwr adolygiadau</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Cau’r gwiriwr ansawdd adolygiadau</string>
+    <string name="review_quality_check_close_handle_content_description">Cau’r gwiriwr adolygiadau</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s allan o 5 seren</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index e7e415e2f..e87acae09 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -65,6 +65,19 @@
     <string name="private_browsing_placeholder_description_2">%1$s rydder din søge- og browserhistorik fra private faneblade, når du lukker dem, eller når du afslutter programmet. Det gør det nemmere at holde din færden på nettet for dig selv, hvis andre bruger den samme computer. Websteder og din internetudbyder kan dog stadig finde ud af, hvad du foretager dig.</string>
     <string name="private_browsing_common_myths">Udbredte myter om privat browsing</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Efterlad ingen spor på denne enhed</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">%1$s sletter din historik samt dine cookies og websteds-data, når du lukker alle dine private vinduer. %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">Hvem kan muligvis se min aktivitet?</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">Åbn dit næste private faneblad med et enkelt tryk.</string>
@@ -88,6 +101,11 @@
     <string name="tcp_cfr_learn_more">Læs om Komplet Cookiebeskyttelse</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">Tryk her for at starte en ny privat session. Slet din historik, cookies — alt.</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">Adgang til kamera er nødvendig. Gå til Indstillinger i Android, tryk på Tilladelser, og tryk så på Tillad.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -225,6 +243,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Startskærm</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">Slet browser-historik</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Valgt sprog</string>
@@ -301,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ikke nu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Gør %s til din standard-browser</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Gør Firefox til din standard-browser</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s sætter mennesker før profit og beskytter dit privatliv ved at blokere sporing på tværs af websteder.\n\nLæs mere om vores %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox sætter mennesker før profit og beskytter dit privatliv ved at blokere sporing på tværs af websteder.\n\nLæs mere i vores privatlivserklæring.</string>
@@ -329,15 +343,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Log ind</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ikke nu</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Meddelelser hjælper dig med at gøre mere med %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Meddelelser hjælper dig med at gøre mere med Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Send faneblade mellem enheder, håndter filhentninger og få tips til at få mest muligt ud af %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Send faneblade mellem enheder, håndter filhentninger og få tips til at få mest muligt ud af Firefox.</string>
@@ -346,6 +354,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Ikke nu</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Prøv Firefox\' søge-widget</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Med Firefox på din startskærm har du nem adgang til browseren, der er fokuseret på at beskytte dit privatliv og blokerer forsøg på at spore dig på tværs af websteder.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Tilføj Firefox-widget</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ikke nu</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">Åbn et nyt %1$s-faneblad</string>
@@ -481,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Tilgængelighed</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Selvvalgt Firefox-kontoserver</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Selvvalgt Firefox-kontoserver</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Selvvalgt Mozilla-kontoserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Selvvalgt synkroniseringsserver</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox-konto/Sync-server ændret. Afslutter applikationen for at anvende ændringerne…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto/Sync-server ændret. Afslutter applikationen for at anvende ændringerne…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-konto/Sync-server ændret. Afslutter applikationen for at anvende ændringerne…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -501,7 +525,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Log ind for at synkronisere dine faneblade, bogmærker, adgangskoder med mere.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-konto</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-konto</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Opret forbindelse igen for at fortsætte synkronisering</string>
     <!-- Preference for language -->
@@ -513,7 +539,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Fjern-debugging via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Vis søgetjenester</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Vis søgetjenester</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Vis søgeforslag</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -532,6 +558,16 @@
     <string name="preferences_account_settings">Kontoindstillinger</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autofuldfør adresser</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Forslag fra sponsorer</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">Støt %1$s med lejlighedsvise sponsorerede forslag</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">Forslag fra  %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Få forslag fra nettet relateret til din søgning</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Åbn links i apps</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -631,9 +667,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Tilføjelsen understøttes ikke</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Tilføjelsen understøttes ikke</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Tilføjelsen er allerede installeret</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Tilføjelsen er allerede installeret</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Tilføjelser er midlertidigt deaktiveret</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">En eller flere tilføjelser holdt op med at virke, hvilket gjorde dit system ustabilt. %1$s prøvede uden held at genstarte tilføjelsen/tilføjelserne.\n\nTilføjelser bliver ikke genstartet under den nuværende session.\n\nFjernelse eller deaktivering af tilføjelser kan løse dette problem.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Prøv at genstarte tilføjelser</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Fortsæt med tilføjelser deaktiveret</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -648,6 +694,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Håndter konto</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Skift din adgangskode, håndter indsamling af data eller slet din konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synkroniser nu</string>
     <!-- Preference category for sync -->
@@ -1314,6 +1362,8 @@
     <string name="snackbar_private_tab_closed">Privat faneblad lukket</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Private faneblade lukket</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Private browsing-data slettet</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">FORTRYD</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1890,7 +1940,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Tilføj</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Gem</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Gem</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Rediger</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2136,6 +2186,175 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Gå til indstillinger</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificering af anmeldelser</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificering af anmeldelser</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Pålidelige anmeldelser</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Blanding af pålidelige og upålidelige anmeldelser</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Upålidelige anmeldelser</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Hvor pålidelige er anmeldelserne?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Justeret bedømmelse</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Upålidelige anmeldelser er blevet fjernet</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Højdepunkter fra de seneste anmeldelser</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Sådan afgør vi kvaliteten af anmeldelser</string>
+
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Vi bruger kunstig intelligens fra %s fra Mozilla til at kontrollere pålideligheden af produktanmeldelser. Dette hjælper dig kun med at bedømme kvaliteten af anmeldelserne, ikke selve produkternes kvalitet.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Vi giver hver produkts anmeldelser en <b>karakter</b> fra A til F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Pålidelige anmeldelser. Vi vurderer, at anmeldelserne sandsynligvis stammer fra rigtige kunder, der har givet ærlige og upartiske anmeldelser.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi vurderer, at anmeldelserne er pålidelige.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Vi vurderer, at der findes en blanding af pålidelige og upålidelige anmeldelser.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Upålidelige anmeldelser. Vi vurderer, at anmeldelserne sandsynligvis er forfalskede eller stammer fra partiske anmeldere.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi vurderer, at anmeldelserne er upålidelige.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Den <b>justerede bedømmelse</b> er udelukkende baseret på anmeldelser, som vi vurderer er pålidelige.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Højdepunkter</b> stammer fra %s-anmeldelser fra de seneste 80 dage, som vi vurderer er pålidelige.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Læs mere om, %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">hvordan %s fra Mozilla afgør kvaliteten af anmeldelser</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Indstillinger</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Vis reklamer i verificering af anmeldelser</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Du vil til tider få vist reklamer for relevante produkter. Alle reklamer skal overholde vores standarder for anmeldelses-kvalitet. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Du vil til tider få vist reklamer for relevante produkter. Vi reklamerer kun for produkter med pålidelige anmeldelser. %s
+</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Læs mere</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Slå verificering af anmeldelser fra</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Mere at overveje</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Reklame fra %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Verificering af anmeldelser er leveret af %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Verificering af anmeldelser er leveret af %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s fra Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Nye oplysninger at kontrollere</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Kontroller nu</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Ikke nok anmeldelser lige nu</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Når dette produkt har flere anmeldelser, kan vi kontrollere kvaliteten af dem.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produktet er ikke tilgængeligt</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Hvis du lægger mærke til at produktet er på lager igen, må du gerne rapportere det. Så kan vi kontrollere anmeldelserne.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Rapporter at produktet er på lager igen</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Rapporter at produktet er på lager</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontrollerer kvaliteten af anmeldelser</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontrollerer kvaliteten af anmeldelser</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Dette kan tage cirka 60 sekunder.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Tak for hjælpen!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Vi burde have oplysninger om dette produkts anmeldelser klar indenfor 24 timer. Tjek igen senere.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Vi kan ikke kontrollere disse anmeldelser</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Vi kan desværre ikke kontrollere kvaliteten af anmeldelser af visse typer af produkter. For eksempel gavekort og streaming af video, musik og spil.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Oplysninger kommer snart</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Vi burde have oplysninger om dette produkts anmeldelser klar indenfor 24 timer. Tjek igen senere.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analysen er opdateret</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Forstået</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Ingen information tilgængelig lige nu</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Vi arbejder på at løse problemet. Prøv igen om lidt.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Ingen netværksforbindelse</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Kontroller din netværksforbindelse og prøv så at genindlæse siden.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Ingen information om disse anmeldelser endnu</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">For at vide, om dette produkts anmeldelser er pålidelige, skal du kontrollere kvaliteten af anmeldelserne. Det tager kun omkring 60 sekunder.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Kontroller kvaliteten af anmeldelserne</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Prøv vores pålidelige vejledning til produktanmeldelser</string>
+
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Se hvor pålidelige produktanmeldelser på %1$s er, inden du køber. Verificering af anmeldelser, en eksperimental funktion fra %2$s, er indbygget i browseren. Den virker også på %3$s og %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Ved hjælp af %1$s fra Mozilla gør vi det nemmere for dig undgå partiske og uægte anmeldelser. Vores kunstig intelligens-model forbedres altid for at beskytte dig, mens du handler. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Læs mere</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Ved at vælge &quot;Ja, prøv det&quot; accepterer du %1$s fra Mozillas %2$s og %3$s.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">privatlivspolitik</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">betingelser for brug</string>
+    <!-- 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. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ikke nu</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Find ud af, om du kan stole på anmeldelserne af dette produkt — før du køber det.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prøv verificering af anmeldelser</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Er disse anmeldelser pålidelige? Tjek nu for at se en justeret bedømmelse.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Åbn verificering af anmeldelser</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Åbn verificering af anmeldelser</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Luk verificering af anmeldelser</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s ud af 5 stjerner</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Vis mindre</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Vis mere</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Kvalitet</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Pris</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Forsendelse</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Emballage og udseende</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Konkurrencedygtighed</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">folde sammen</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 947c2f79c..477701363 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -328,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Nicht jetzt</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Machen Sie %s zu Ihrem Browser Nr. 1.</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Machen Sie Firefox zu Ihrem Browser Nr. 1.</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s stellt Menschen über Gewinne und schützt Ihre Privatsphäre, indem er websiteübergreifende Tracker blockiert.\n\nErfahren Sie mehr in unserem %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox stellt Menschen über Gewinne und schützt Ihre Privatsphäre, indem er websiteübergreifende Tracker blockiert.\n\nErfahren Sie mehr in unserem Datenschutzhinweis.</string>
@@ -356,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Anmelden</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Nicht jetzt</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Benachrichtigungen helfen Ihnen, mehr aus %s zu machen</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Benachrichtigungen helfen Ihnen, mehr aus Firefox zu machen</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Versenden Sie Tabs zwischen Geräten, verwalten Sie Downloads und erhalten Sie Tipps zur optimalen Nutzung von %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Versenden Sie Tabs zwischen Geräten, verwalten Sie Downloads und erhalten Sie Tipps zur optimalen Nutzung von Firefox.</string>
@@ -519,11 +506,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Barrierefreiheit</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Benutzerdefinierter Firefox-Kontoserver</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Benutzerdefinierter Firefox-Kontoserver</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Benutzerdefinierter Mozilla-Kontoserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Benutzerdefinierter Sync-Server</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Server für Firefox-Konto/Sync geändert. Anwendung wird beendet, um Änderungen zu übernehmen…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Server für Firefox-Konto/Sync geändert. Anwendung wird beendet, um Änderungen zu übernehmen…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Server für Mozilla-Konto/Sync geändert. Anwendung wird beendet, um Änderungen zu übernehmen…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -539,7 +530,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Melden Sie sich an, um Tabs, Lesezeichen, Passwörter und mehr zu synchronisieren.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-Konto</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-Konto</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-Konto</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Stellen Sie die Verbindung erneut her, um die Synchronisierung fortzusetzen</string>
     <!-- Preference for language -->
@@ -551,7 +544,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Externes Debugging über USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Suchmaschinen anzeigen</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Suchmaschinen anzeigen</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Suchvorschläge anzeigen</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -571,6 +564,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autovervollständigung von Adressen</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Vorschläge von Sponsoren</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">Unterstützen Sie %1$s mit gelegentlich gesponserten Vorschlägen</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">Vorschläge von %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Erhalten Sie Vorschläge aus dem Web, die sich auf Ihre Suche beziehen</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Links in Apps öffnen</string>
 
@@ -671,9 +674,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Add-on wird nicht unterstützt</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Add-on wird nicht unterstützt</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Add-on ist bereits installiert</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Add-on ist bereits installiert</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Add-ons sind temporär deaktiviert</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Ein oder mehrere Add-ons funktionieren nicht mehr und machen Ihr System instabil. %1$s hat erfolglos versucht, das Add-on oder die Add-ons neu zu starten.\n\nAdd-ons werden während Ihrer aktuellen Sitzung nicht neu gestartet.\n\nEntfernen oder Deaktivieren von Add-ons kann dieses Problem beheben.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Versuchen, die Add-ons neu zu starten</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Mit deaktivierten Add-ons fortfahren</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -688,6 +701,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Benutzerkonto verwalten</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Ändern Sie Ihr Passwort, verwalten Sie die Datensammlung oder löschen Sie Ihr Konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Jetzt synchronisieren</string>
     <!-- Preference category for sync -->
@@ -1970,7 +1985,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Hinzufügen</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Speichern</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Speichern</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Bearbeiten</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2219,7 +2234,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Rezensionsprüfer</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Rezensionsprüfer</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Rezensionsprüfer</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Zuverlässige Bewertungen</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2239,17 +2256,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Wir verwenden die KI-Technologie von %s von Mozilla, um die Zuverlässigkeit von Produktbewertungen zu überprüfen. Dies hilft nur bei der Einschätzung der Qualität der Bewertung, nicht der Produktqualität.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Wir geben den Bewertungen jedes Produkts eine <b>Bewertung</b> von A bis F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Wir geben den Bewertungen jedes Produkts eine <b>Bewertung</b> von A bis F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Zuverlässige Bewertungen. Wir glauben, dass die Bewertungen von echten Kunden stammen, die ehrliche und unvoreingenommene Bewertungen hinterlassen.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wir halten die Bewertungen für zuverlässig.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Wir glauben, dass es eine Mischung aus zuverlässigen und unzuverlässigen Bewertungen gibt.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Unzuverlässige Bewertungen. Wir glauben, dass die Bewertungen wahrscheinlich gefälscht, oder von voreingenommenen Bewertern sind.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wir halten die Bewertungen für unzuverlässig.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Die <b>angepasste Bewertung</b> basiert nur auf Bewertungen, die wir für zuverlässig halten.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Highlights</b> stammen von %s-Bewertungen innerhalb der letzten 80 Tage, die wir für zuverlässig halten.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Highlights</b> stammen von %s-Bewertungen innerhalb der letzten 80 Tage, die wir für zuverlässig halten.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Weitere Informationen zu %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2259,7 +2280,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Werbung im Rezensionsprüfer anzeigen</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Sie sehen gelegentlich Anzeigen für relevante Produkte. Alle Anzeigen müssen unseren Qualitätsstandards für Bewertungen entsprechen. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Sie sehen gelegentlich Anzeigen für relevante Produkte. Alle Anzeigen müssen unseren Qualitätsstandards für Bewertungen entsprechen. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Sie sehen gelegentlich Anzeigen für relevante Produkte. Wir bewerben nur Produkte mit vertrauenswürdigen Bewertungen. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Weitere Informationen</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2279,29 +2302,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Jetzt prüfen</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Noch nicht genügend Bewertungen</string>
+    <string name="review_quality_check_no_reviews_warning_title">Noch nicht genügend Bewertungen</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Wenn dieses Produkt mehr Bewertungen hat, können wir deren Qualität überprüfen.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Wenn dieses Produkt mehr Bewertungen hat, können wir deren Qualität überprüfen.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt ist nicht verfügbar</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Wenn Sie sehen, dass dieses Produkt wieder auf Lager ist, melden Sie es und wir arbeiten an der Überprüfung der Bewertungen.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Melden, dass dieses Produkt wieder auf Lager ist</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Melden, dass dieses Produkt wieder auf Lager ist</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Melden, dass das Produkt vorrätig ist</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Qualität der Bewertung wird überprüft</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Qualität der Bewertung wird überprüft</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Qualität der Bewertung wird überprüft</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Qualität der Bewertung wird überprüft</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Dies kann etwa 60 Sekunden dauern.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Dies kann etwa 60 Sekunden dauern.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Danke für die Meldung!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Wir sollten innerhalb von 24 Stunden Informationen über die Bewertungen dieses Produkts haben. Bitte versuchen Sie es später noch einmal.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Wir können diese Bewertungen nicht überprüfen</string>
+    <string name="review_quality_check_not_analyzable_info_title">Wir können diese Bewertungen nicht überprüfen</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Leider können wir die Qualität der Bewertungen für bestimmte Arten von Produkten nicht überprüfen. Zum Beispiel Geschenkkarten und Video-Streaming, Musik und Spiele.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Leider können wir die Qualität der Bewertungen für bestimmte Arten von Produkten nicht überprüfen. Zum Beispiel Geschenkkarten und Video-Streaming, Musik und Spiele.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Weitere Informationen folgen in Kürze</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2311,19 +2336,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Verstanden</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Derzeit sind keine Informationen verfügbar</string>
+    <string name="review_quality_check_generic_error_title">Derzeit sind keine Informationen verfügbar</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Wir arbeiten an einer Lösung des Problems. Bitte schauen Sie bald wieder vorbei.</string>
+    <string name="review_quality_check_generic_error_body">Wir arbeiten an einer Lösung des Problems. Bitte schauen Sie bald wieder vorbei.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Keine Netzwerkverbindung</string>
+    <string name="review_quality_check_no_connection_title">Keine Netzwerkverbindung</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie dann, die Seite neu zu laden.</string>
+    <string name="review_quality_check_no_connection_body">Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie dann, die Seite neu zu laden.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Noch keine Informationen zu diesen Bewertungen</string>
+    <string name="review_quality_check_no_analysis_title">Noch keine Informationen zu diesen Bewertungen</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Um zu wissen, ob die Bewertungen dieses Produkts zuverlässig sind, überprüfen Sie die Qualität der Bewertungen. Es dauert nur etwa 60 Sekunden.</string>
+    <string name="review_quality_check_no_analysis_body">Um zu wissen, ob die Bewertungen dieses Produkts zuverlässig sind, überprüfen Sie die Qualität der Bewertungen. Es dauert nur etwa 60 Sekunden.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Qualität der Bewertung überprüfen</string>
+    <string name="review_quality_check_no_analysis_link">Qualität der Bewertung überprüfen</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Lesen Sie unseren vertrauenswürdigen Leitfaden zur Produktbewertung</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2351,11 +2376,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Rezensionsprüfer öffnen</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Qualitätskontrolle der Bewertungen öffnen</string>
+    <string name="review_quality_check_open_handle_content_description">Rezensionsprüfer öffnen</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Qualitätskontrolle der Bewertungen schließen</string>
+    <string name="review_quality_check_close_handle_content_description">Rezensionsprüfer schließen</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s von 5 Sternen</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index d6a9ea77b..0b94deeb2 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -322,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Nic něnto</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Wužywajśo %s pó droze</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Wužywajśo Firefox pó droze</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s luźi nad wudobytki staja a blokěrujo sedła pśesegajuce slědowaki, aby wašu priwatnosć šćitał.\n\nDalšne informacije w našom %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox luźi nad wudobytki staja a blokěrujo sedła pśesegajuce slědowaki, aby wašu priwatnosć šćitał.\n\nDalšne informacije w našej powěźeńce priwatnosći.</string>
@@ -350,16 +343,10 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Pśizjawiś</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Nic něnto</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Powěźeńki wam pomagaju, wěcej z %s cyniś</string>
 
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Powěźeńki wam pomagaju, wěcej z Firefox cyniś</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Sćelśo rejtariki mjazy rědami, zastojśo ześěgnjenja  a dostańśo pokaze, aby nejwěcej z %s wuwónoźeł.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Sćelśo rejtariki mjazy rědami, zastojśo ześěgnjenja  a dostańśo pokaze, aby nejwěcej z Firefox wuwónoźeł.</string>
@@ -512,11 +499,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Bźezbariernosć</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Swójski kontowy serwer Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Swójski kontowy serwer Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Swójski kontowy serwer Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Swójski synchronizěrowański serwer</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Kontowy resp. synchronizěrowański serwer Firefox jo se změnił. Nałoženje se kóńcy, aby se změny nałožyli…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontowy resp. synchronizěrowański serwer Firefox jo se změnił. Nałoženje se kóńcy, aby se změny nałožyli…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Kontowy resp. synchronizěrowański serwer Mozilla jo se změnił. Nałoženje se kóńcy, aby se změny nałožyli…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -532,7 +523,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Zregistrěrujśo se, aby rejtariki, cytańske znamjenja, gronidła a dalšne synchronizěrował.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Konto Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Konto Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Konto Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Zasej zwězaś, aby ze synchronizaciju pókšacowało</string>
     <!-- Preference for language -->
@@ -544,7 +537,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Daloke pytanje zmólkow pśez USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Pytnice pokazaś</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Pytnice pokazaś</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Pytańske naraźenja pokazaś</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -563,6 +556,16 @@
     <string name="preferences_account_settings">Kontowe nastajenja</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">URL awtomatiski wudopołniś</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Naraźenja wót sponsorow</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">Pódprějśo %1$s z pśigóźbnymi sponserowanymi naraźenjami</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">Naraźenja wót %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Wobstarajśo se naraźenja z weba nastupajucy wašo pytanje</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Wótkaze w nałoženjach wócyniś</string>
 
@@ -664,9 +667,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Dodank se njepódpěra</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Dodank se njepódpěra</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Dodank jo južo zainstalowany.</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Dodank jo južo zainstalowany.</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Dodanki su nachylu znjemóžnjone</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Jaden dodank abo někotare dodanki su pśestali funkcioněrowaś a destabilizěruju waš system. %1$s jo njewuspěšnje wopytał, dodanki znowego startowaś.\n\nDodanki se za wašo aktualne pósejźenje znowego njestartuju.\n\nGaž dodanki wótwónoźujośo abo znjemóžnjaśo, buźo se toś ten problem snaź rozwězaś.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Wopytajśo dodanki znowego startowaś</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Ze znjemóžnjonymi dodankami pókšacowaś</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -681,6 +694,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Konto zastojaś</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Změńśo swójo gronidło, zastojśo datowu zběrku abo lašujśo swójo konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Něnto synchronizěrowaś</string>
     <!-- Preference category for sync -->
@@ -1937,7 +1952,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Pśidaś</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Składowaś</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Składowaś</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Wobźěłaś</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2178,7 +2193,7 @@
     <!-- Clickable text for opening an external link for more information about Pocket. -->
     <string name="pocket_stories_feature_learn_more">Dalšne informacije</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">Sponsorowany</string>
+    <string name="pocket_stories_sponsor_indication">Sponserowany</string>
 
     <!-- Snackbar message for enrolling in a Nimbus experiment from the secret settings when Studies preference is Off.-->
     <string name="experiments_snackbar">Zmóžniśo telemetriju, aby daty słał.</string>
@@ -2187,7 +2202,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Kontrola pógódnośenjow</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontrola pógódnośenjow</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Kontrola pógódnośenjow</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Spušćobne pógódnośenja</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2208,17 +2225,21 @@
     <string name="review_quality_check_explanation_body_reliability">Wužywamy technologiju KI z %s wót Mozilla, aby my spušćobnosć produktowych pógódnośenjow kontrolěrowali.
 To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produktow.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Pśirědujomy pógódnośenjam kuždego produkta <b>pismikowu cenzuru</b> wót A do F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Pśirědujomy pógódnośenjam kuždego produkta <b>pismikowu cenzuru</b> wót A do F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Spušćobne pógódnośenja. Myslimy se, až pógódnośenja su nejskerjej wót wopšawdnych kupcow, kótarež su zawóstajili spšawne, bźezpśedsudkowe pógódnośenja.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wěrimy, až pógódnośenja su spušćobne.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Wěrimy, až dajo měšańcu spušćobnych a njespušćobnych pógódnośenjow.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Njespušćobne pógódnośenja. Myslimy se, až pógódnośenja su nejskerjej sfalšowane abo wót pógódnośujucych z pśedsudkami.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wěrimy, až pógódnośenja njejsu spušćobne.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Pśiměrjone pógódnośowanje</b> jano na pógódnośenjach bazěrujo, kótarež mamy za spušćobne.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Wjerški</b> su z pógódnośenjow %s w běgu slědnych 80 dnjow, kótarež mamy za spušćobne.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Wjerški</b> su z pógódnośenjow %s w běgu slědnych 80 dnjow, kótarež mamy za spušćobne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zgóńśo wěcej wó %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2228,7 +2249,9 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Wabjenje w kontroli pógódnośenjow pokazaś</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Buźośo wótergi wabjenje za relewantne produkty wiźeś. Wšykne wabjeńske anonse muse našym standardam za kwalitu pógódnośenjow wótpowědowaś. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Buźośo wótergi wabjenje za relewantne produkty wiźeś. Wšykne wabjeńske anonse muse našym standardam za kwalitu pógódnośenjow wótpowědowaś. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Buźośo pśi góźbje wabjenje za relewantne produkty wiźeś. Wabimy jano za produkty ze spušćobnymi pógódnośenjami. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Dalšne informacije</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2248,30 +2271,32 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Něnto kontrolěrowaś</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Hyšći njejo dosć pógódnośenjow</string>
+    <string name="review_quality_check_no_reviews_warning_title">Hyšći njejo dosć pógódnośenjow</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Gaž toś ten produkt ma wěcej pógódnośenjow, móžomy jich kwalitu kontrolěrowaś.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Gaž toś ten produkt ma wěcej pógódnośenjow, móžomy jich kwalitu kontrolěrowaś.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt njejo k dispoziciji</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Jolic wiźiśo, až toś ten produkt jo zasej na skłaźe, dajśo to k wěsći a buźomy na kontrolěrowanju pógódnośenjow źěłaś.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">K wěsći daś, až toś ten produkt jo zasej na skłaźe</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">K wěsći daś, až toś ten produkt jo zasej na skłaźe</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">K wěsći daś, až produkt jo na skłaźe</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrola kwalitu pógódnośenjow</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontrola kwalitu pógódnośenjow</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrola kwalitu pógódnośenjow</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontrola kwalitu pógódnośenjow</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">To mógło na 60 sekundow traś.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">To mógło na 60 sekundow traś.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Wjeliki źěk za powěźeńku!</string>
 
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">My dejali w běgu 24 góźin informacije wó pógódnośenjach toś togo produkta měś. Pśiźćo pšosym mimo.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Njamóžomy toś te pógódnośenja pśeglědowaś</string>
+    <string name="review_quality_check_not_analyzable_info_title">Njamóžomy toś te pógódnośenja pśeglědowaś</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Bóžko  njamóžomy kwalitu pógódnośenja za wěste produktowe typy kontrolěrowaś. Na pśikład za darjeńske kórty a tšugajuce wideo, muziku a graśa.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Bóžko  njamóžomy kwalitu pógódnośenja za wěste produktowe typy kontrolěrowaś. Na pśikład za darjeńske kórty a tšugajuce wideo, muziku a graśa.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informacije skóro pśidu</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2281,19 +2306,19 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Som zrozměł</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Tuchylu informacije njejsu k dispoziciji</string>
+    <string name="review_quality_check_generic_error_title">Tuchylu informacije njejsu k dispoziciji</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Źěłamy na rozwězanju toś togo problema. Pśiźćo pšosym skóro zasej mimo.</string>
+    <string name="review_quality_check_generic_error_body">Źěłamy na rozwězanju toś togo problema. Pśiźćo pšosym skóro zasej mimo.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Žeden seśowy zwisk</string>
+    <string name="review_quality_check_no_connection_title">Žeden seśowy zwisk</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Pśeglědajśo swój seśowy zwisk a wopytajśo pón bok znowego zacytaś.</string>
+    <string name="review_quality_check_no_connection_body">Pśeglědajśo swój seśowy zwisk a wopytajśo pón bok znowego zacytaś.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Hyšći žedne informacije wó toś tych pógódnośenjach</string>
+    <string name="review_quality_check_no_analysis_title">Hyšći žedne informacije wó toś tych pógódnośenjach</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Aby zgónił, lěc pógódnośenja toś togo produkta su spušćobne, kontrolěrujśo kwalitu pógódnośenjow. Trajo jano na 60 sekundow.</string>
+    <string name="review_quality_check_no_analysis_body">Aby zgónił, lěc pógódnośenja toś togo produkta su spušćobne, kontrolěrujśo kwalitu pógódnośenjow. Trajo jano na 60 sekundow.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Kwalitu pógódnośenjow kontrolěrowaś</string>
+    <string name="review_quality_check_no_analysis_link">Kwalitu pógódnośenjow kontrolěrowaś</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Cytajśo naš dowěry gódny pśewodnik wó pógódnośenjach produktow</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2321,11 +2346,11 @@ To buźo jano pomagaś, kwalitu pógódnośenjow pósuźiś, nic kwalitu produkt
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Kontrolu pógódnośenjow wócyniś</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Kontrolu kwality pógódnośenjow wócyniś</string>
+    <string name="review_quality_check_open_handle_content_description">Kontrolu pógódnośenjow wócyniś</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Kontrolu kwality pógódnośenjow zacyniś</string>
+    <string name="review_quality_check_close_handle_content_description">Kontrolu pógódnośenjow zacyniś</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s z 5 gwězdkow</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 19287d638..bcdcdf0b5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -71,6 +71,19 @@
        Συνήθεις παρανοήσεις σχετικά με την ιδιωτική περιήγηση
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Περιηγηθείτε χωρίς να αφήνετε ίχνη σε αυτήν τη συσκευή</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">Το %1$s διαγράφει τα cookies, το ιστορικό και τα δεδομένα ιστοτόπων σας όταν κλείνετε όλα τα ιδιωτικά σας παράθυρα. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Ποιος ενδέχεται να μπορεί να δει τη δραστηριότητά μου;</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">Εκκινήστε την επόμενη ιδιωτική καρτέλα σας με ένα πάτημα.</string>
@@ -94,6 +107,11 @@
     <string name="tcp_cfr_learn_more">Μάθετε για την Ολική προστασία cookie</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">Πατήστε εδώ για να ξεκινήσετε μια νέα ιδιωτική συνεδρία. Διαγράψτε το ιστορικό σας, τα cookies… τα πάντα.</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">Απαιτείται πρόσβαση στην κάμερα. Μεταβείτε στις Ρυθμίσεις Android, πατήστε «Δικαιώματα» και επιλέξτε «Να επιτρέπεται».</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -231,6 +249,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Αρχική οθόνη</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Διαγραφή ιστορικού περιήγησης</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Επιλεγμένη γλώσσα</string>
@@ -309,16 +330,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Όχι τώρα</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Ορίστε το %s ως το προεπιλεγμένο πρόγραμμα περιήγησής σας</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Ορίστε το FIrefox ως το προεπιλεγμένο πρόγραμμα περιήγησής σας</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Το %1$s θέτει σε προτεραιότητα τους ανθρώπους και όχι τα κέρδη, προστατεύοντας το απόρρητό σας με αποκλεισμό των ιχνηλατών μεταξύ ιστοτόπων.\n\nΜάθετε περισσότερα στη %2$s μας.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Το Firefox θέτει σε προτεραιότητα τους ανθρώπους και όχι τα κέρδη, προστατεύοντας το απόρρητό σας με αποκλεισμό των ιχνηλατών μεταξύ ιστοτόπων.\n\nΜάθετε περισσότερα στη σημείωση απορρήτου μας.</string>
@@ -337,15 +351,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Σύνδεση</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Όχι τώρα</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Οι ειδοποιήσεις σάς βοηθούν να κάνετε περισσότερα με το %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Οι ειδοποιήσεις σάς βοηθούν να κάνετε περισσότερα με το Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Αποστολή καρτελών μεταξύ συσκευών, διαχείριση λήψεων και λήψη συμβουλών για την αξιοποίηση του %s στο έπακρο.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Αποστολή καρτελών μεταξύ συσκευών, διαχείριση λήψεων και λήψη συμβουλών για την αξιοποίηση του Firefox στο έπακρο.</string>
@@ -354,6 +362,15 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Όχι τώρα</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Δοκιμή του widget αναζήτησης του Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Με τον Firefox στην αρχική σας οθόνη, θα έχετε εύκολη πρόσβαση στο πρόγραμμα περιήγησης που εστιάζει στο απόρρητό σας, αποκλείοντας τους ιχνηλάτες μεταξύ ιστοτόπων.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Προσθήκη widget Firefox</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Όχι τώρα</string>
 
@@ -492,11 +509,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Προσβασιμότητα</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Προσαρμοσμένος διακομιστής λογαριασμού Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Προσαρμοσμένος διακομιστής λογαριασμού Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Προσαρμοσμένος διακομιστής λογαριασμού Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Προσαρμοσμένος διακομιστής Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Ο διακομιστής λογαριασμού Firefox/Sync τροποποιήθηκε. Τερματισμός εφαρμογής για εφαρμογή αλλαγών…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Ο διακομιστής λογαριασμού Firefox/Sync τροποποιήθηκε. Τερματισμός εφαρμογής για εφαρμογή αλλαγών…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Ο διακομιστής λογαριασμού Mozilla και συγχρονισμού τροποποιήθηκε. Γίνεται τερματισμός της εφαρμογής για εφαρμογή των αλλαγών…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Λογαριασμός</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -513,7 +534,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Συνδεθείτε για να συγχρονίσετε τις καρτέλες, τους σελιδοδείκτες, τους κωδικούς πρόσβασης και πολλά άλλα.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Λογαριασμός Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Λογαριασμός Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Συνδεθείτε ξανά για συνέχεια συγχρονισμού</string>
     <!-- Preference for language -->
@@ -525,7 +548,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Απομακρυσμένος έλεγχος σφαλμάτων μέσω USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Εμφάνιση μηχανών αναζήτησης</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Εμφάνιση μηχανών αναζήτησης</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 -->
@@ -544,6 +567,16 @@
     <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 -->
@@ -646,9 +679,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Το πρόσθετο δεν υποστηρίζεται</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Το πρόσθετο δεν υποστηρίζεται</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Το πρόσθετο είναι ήδη εγκατεστημένο</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Το πρόσθετο είναι ήδη εγκατεστημένο</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Τα πρόσθετα έχουν απενεργοποιηθεί προσωρινά</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Ένα ή περισσότερα πρόσθετα σταμάτησαν να λειτουργούν, καθιστώντας το σύστημά σας ασταθές. Το %1$s προσπάθησε ανεπιτυχώς να επανεκκινήσει τα πρόσθετα.\n\nΤα πρόσθετα δεν θα επανεκκινηθούν κατά τη διάρκεια της τρέχουσας συνεδρίας σας.\n\nΗ αφαίρεση ή η απενεργοποίηση των προσθέτων ενδέχεται να διορθώσει αυτό το ζήτημα.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Δοκιμάστε να επανεκκινήσετε τα πρόσθετα</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Συνέχεια με ανενεργά πρόσθετα</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -663,6 +706,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Διαχείριση λογαριασμού</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Αλλάξτε τον κωδικό πρόσβασής σας, διαχειριστείτε τη συλλογή δεδομένων ή διαγράψτε τον λογαριασμό σας</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Συγχρονισμός τώρα</string>
     <!-- Preference category for sync -->
@@ -1337,6 +1382,8 @@
     <string name="snackbar_private_tab_closed">Η ιδιωτική καρτέλα έκλεισε</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Οι ιδιωτικές καρτέλες έκλεισαν</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Τα δεδομένα ιδιωτικής περιήγησης διαγράφηκαν</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ΑΝΑΙΡΕΣΗ</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1925,7 +1972,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Προσθήκη</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Αποθήκευση</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Αποθήκευση</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Επεξεργασία</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2178,7 +2225,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Έλεγχος κριτικών</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Έλεγχος κριτικών</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Έλεγχος κριτικών</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Αξιόπιστες κριτικές</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2188,7 +2237,31 @@
     <!-- Text for title presenting the reliability of a product's reviews. -->
     <string name="review_quality_check_grade_title">Πόσο αξιόπιστες είναι αυτές οι κριτικές;</string>
     <!-- Title for when the rating has been updated by the review checker -->
-    <string name="review_quality_check_adjusted_rating_title">Προσαρμοσμένη βαθμολογία</string>
+    <string name="review_quality_check_adjusted_rating_title">Αναπροσαρμοσμένη βαθμολογία</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Οι αναξιόπιστες κριτικές αφαιρέθηκαν</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Σημαντικά σημεία από πρόσφατες κριτικές</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Πώς προσδιορίζουμε την ποιότητα των κριτικών</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Χρησιμοποιούμε τεχνολογία AI από το %s της Mozilla για να ελέγξουμε την αξιοπιστία των κριτικών προϊόντων. Αυτό θα σας βοηθήσει να αξιολογήσετε μόνο την ποιότητα των κριτικών, όχι την ποιότητα των προϊόντων. </string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Αναθέτουμε στις κριτικές κάθε προϊόντος έναν <b>βαθμό</b>, από A έως F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Αξιόπιστες κριτικές. Πιστεύουμε ότι οι κριτικές προέρχονται πιθανότατα από πραγματικούς πελάτες, που άφησαν ειλικρινείς και αντικειμενικές κριτικές.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Πιστεύουμε ότι οι κριτικές είναι αξιόπιστες.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Πιστεύουμε ότι υπάρχει ένας συνδυασμός αξιόπιστων και αναξιόπιστων κριτικών.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Αναξιόπιστες κριτικές. Πιστεύουμε ότι οι κριτικές είναι μάλλον ψευδείς ή προέρχονται από άτομα που μεροληπτούν.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Πιστεύουμε ότι οι κριτικές είναι αναξιόπιστες.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Η <b>αναπροσαρμοσμένη βαθμολογία</b> βασίζεται μόνο στις κριτικές που πιστεύουμε ότι είναι αξιόπιστες.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Τα <b>σημαντικά σημεία</b> προέρχονται από κριτικές για το %s, οι οποίες γράφτηκαν τις τελευταίες 80 ημέρες και πιστεύουμε ότι είναι αξιόπιστες.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Μάθετε περισσότερα σχετικά με το %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2197,6 +2270,10 @@
     <string name="review_quality_check_settings_title">Ρυθμίσεις</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Εμφάνιση διαφημίσεων στον έλεγχο κριτικών</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Θα βλέπετε περιστασιακά διαφημίσεις για σχετικά προϊόντα. Όλες οι διαφημίσεις πρέπει να πληρούν τα πρότυπά μας για την ποιότητα των κριτικών. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Θα βλέπετε περιστασιακά διαφημίσεις για σχετικά προϊόντα. Διαφημίζουμε μόνο προϊόντα με αξιόπιστες κριτικές. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Μάθετε περισσότερα</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2205,20 +2282,70 @@
     <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Περισσότερες εναλλακτικές</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Διαφήμιση από το %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Ο έλεγχος κριτικών παρέχεται από το %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Ο έλεγχος κριτικών παρέχεται από το %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s από τη Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Νέες πληροφορίες προς έλεγχο</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Έλεγχος τώρα</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Δεν υπάρχουν ακόμα αρκετές κριτικές</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Όταν αυτό το προϊόν λάβει περισσότερες κριτικές, θα μπορέσουμε να ελέγξουμε την ποιότητά τους.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Το προϊόν δεν είναι διαθέσιμο</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Εάν παρατηρήσετε ότι αυτό το προϊόν είναι ξανά σε απόθεμα, αναφέρετέ το σε μας και θα αρχίσουμε τον έλεγχο των κριτικών.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Αναφέρετε ότι το προϊόν είναι ξανά σε απόθεμα</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Αναφέρετε ότι το προϊόν είναι σε απόθεμα</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Έλεγχος ποιότητας κριτικής</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Έλεγχος ποιότητας κριτικής</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Έλεγχος ποιότητας κριτικής</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Έλεγχος ποιότητας κριτικής</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Αυτό μπορεί να διαρκέσει περίπου 60 δευτερόλεπτα.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Ευχαριστούμε για την αναφορά!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Θα έχουμε πληροφορίες για τις κριτικές αυτού του προϊόντος εντός 24 ωρών. Παρακαλούμε ελέγξτε ξανά.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Δεν μπορούμε να ελέγξουμε αυτές τις κριτικές</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Δυστυχώς, δεν μπορούμε να ελέγξουμε την ποιότητα των κριτικών για ορισμένους τύπους προϊόντων, όπως δωροκάρτες, βίντεο σε μορφή streaming, μουσική και παιχνίδια.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Περισσότερες πληροφορίες σύντομα</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Θα έχουμε πληροφορίες για τις κριτικές αυτού του προϊόντος εντός 24 ωρών. Παρακαλούμε ελέγξτε ξανά.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Η ανάλυση είναι ενημερωμένη</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Το κατάλαβα</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Δεν υπάρχουν διαθέσιμες πληροφορίες αυτήν τη στιγμή</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Εργαζόμαστε για την επίλυση του προβλήματος. Παρακαλούμε ελέγξτε ξανά σύντομα.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Δεν υπάρχει σύνδεση στο δίκτυο</string>
+    <string name="review_quality_check_no_connection_title">Δεν υπάρχει σύνδεση στο δίκτυο</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Ελέγξτε τη σύνδεση δικτύου σας και έπειτα, δοκιμάστε να φορτώσετε ξανά τη σελίδα.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Δεν υπάρχουν ακόμα πληροφορίες σχετικά με αυτές τις κριτικές</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Για να μάθετε εάν οι κριτικές αυτού του προϊόντος είναι αξιόπιστες, ελέγξτε την ποιότητά τους. Διαρκεί μόλις 60 περίπου δευτερόλεπτα.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Έλεγχος ποιότητας κριτικής</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Δοκιμάστε τον αξιόπιστο οδηγό μας για κριτικές προϊόντων</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Δείτε πόσο αξιόπιστες είναι οι κριτικές των προϊόντων στο %1$s πριν αγοράσετε. Ο έλεγχος κριτικών, μια πειραματική δυνατότητα από τo %2$s, ενσωματώνεται στο πρόγραμμα περιήγησης. Λειτουργεί επίσης στο %3$s και στο %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Με την υποστήριξη του %1$s της Mozilla, σας βοηθάμε να αποφύγετε τις μεροληπτικές και ψευδείς κριτικές. Το μοντέλο AI μας βελτιώνεται συνεχώς για να σας προστατεύει όσο κάνετε τις αγορές σας. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Μάθετε περισσότερα</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2231,8 +2358,20 @@
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Έναρξη δοκιμής</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Όχι τώρα</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Μάθετε εάν μπορείτε να εμπιστευτείτε τις κριτικές αυτού του προϊόντος πριν το αγοράσετε.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Δοκιμή ελέγχου κριτικών</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Είναι αξιόπιστες αυτές οι κριτικές; Κάντε έλεγχο τώρα για να δείτε μια αναπροσαρμοσμένη βαθμολογία.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Άνοιγμα ελέγχου κριτικών</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Άνοιγμα ελέγχου κριτικών</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Κλείσιμο ελέγχου κριτικών</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s από 5 αστέρια</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 5db92e0e2..c6c4dd1e2 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -321,16 +321,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Not now</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Make %s your go-to browser</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Make Firefox your go-to browser</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our privacy notice.</string>
@@ -349,15 +342,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Sign in</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Not now</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Notifications help you do more with %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Notifications help you do more with Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Send tabs between devices, manage downloads, and get tips on getting the most out of %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Send tabs between devices, manage downloads, and get tips on getting the most out of Firefox.</string>
@@ -511,11 +498,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibility</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Custom Firefox Account server</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Custom Firefox Account server</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Custom Mozilla account server</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Custom Sync server</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox Account/Sync server modified. Quitting the application to apply changes…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account/Sync server modified. Quitting the application to apply changes…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla account/Sync server modified. Quitting the application to apply changes…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -532,7 +523,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Sign in to synchronise tabs, bookmarks, passwords, and more.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox Account</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla account</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconnect to resume synchronising</string>
     <!-- Preference for language -->
@@ -544,7 +537,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Show search engines</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Show search engines</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Show search suggestions</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -563,6 +556,16 @@
     <string name="preferences_account_settings">Account settings</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocomplete URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestions from sponsors</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">Support %1$s with occasional sponsored suggestions</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">Suggestions from %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Get suggestions from the web related to your search</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Open links in apps</string>
 
@@ -663,9 +666,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Add-on is not supported</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Add-on is not supported</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Add-on is already installed</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Add-on is already installed</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Add-ons are temporarily disabled</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">One or more add-ons stopped working, making your system unstable. %1$s unsuccessfully tried to restart the add-on(s).\n\nAdd-ons won’t be restarted during your current session.\n\nRemoving or disabling add-ons may fix this issue.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Try restarting add-ons</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continue with add-ons disabled</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -680,6 +693,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Manage account</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Change your password, manage data collection, or delete your account</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronise now</string>
     <!-- Preference category for sync -->
@@ -1926,7 +1941,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Add</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Save</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Save</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Edit</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2175,7 +2190,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Review checker</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Review checker</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Review Checker</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Reliable reviews</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2195,17 +2212,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">We use AI technology from %s by Mozilla to check the reliability of product reviews. This will only help you assess review quality, not product quality. </string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[We assign each product’s reviews a <b>letter grade</b> from A to F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[We assign each product’s reviews a <b>letter grade</b> from A to F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Reliable reviews. We believe the reviews are likely from real customers who left honest, unbiased reviews.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">We believe the reviews to be reliable.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">We believe there’s a mix of reliable and unreliable reviews.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Unreliable reviews. We believe the reviews are likely fake or from biased reviewers.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">We believe the reviews are unreliable.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[The <b>adjusted rating</b> is based only on reviews we believe to be reliable.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Highlights</b> are from %s reviews within the last 80 days that we believe to be reliable.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Highlights</b> are from %s reviews within the last 80 days that we believe to be reliable.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Learn more about %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2215,7 +2236,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Show ads in review checker</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">You’ll see occasional ads for relevant products. All ads must meet our review quality standards. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">You’ll see occasional ads for relevant products. All ads must meet our review quality standards. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">You’ll see occasional ads for relevant products. We only advertise products with reliable reviews. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Learn more</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2235,29 +2258,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Check now</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Not enough reviews yet</string>
+    <string name="review_quality_check_no_reviews_warning_title">Not enough reviews yet</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">When this product has more reviews, we’ll be able to check their quality.</string>
+    <string name="review_quality_check_no_reviews_warning_body">When this product has more reviews, we’ll be able to check their quality.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Product is not available</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">If you see this product is back in stock, report it and we’ll work on checking the reviews.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Report this product is back in stock</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Report this product is back in stock</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Report product is in stock</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Checking review quality</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Checking review quality</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Checking review quality</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Checking review quality</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">This could take about 60 seconds.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">This could take about 60 seconds.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Thanks for reporting!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">We should have info about this product’s reviews within 24 hours. Please check back.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">We can’t check these reviews</string>
+    <string name="review_quality_check_not_analyzable_info_title">We can’t check these reviews</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Unfortunately, we can’t check the review quality for certain types of products. For example, gift cards and streaming video, music, and games.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Unfortunately, we can’t check the review quality for certain types of products. For example, gift cards and streaming video, music, and games.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Info coming soon</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2267,19 +2292,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Got it</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">No info available right now</string>
+    <string name="review_quality_check_generic_error_title">No info available right now</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">We’re working to resolve the issue. Please check back soon.</string>
+    <string name="review_quality_check_generic_error_body">We’re working to resolve the issue. Please check back soon.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">No network connection</string>
+    <string name="review_quality_check_no_connection_title">No network connection</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Check your network connection and then try reloading the page.</string>
+    <string name="review_quality_check_no_connection_body">Check your network connection and then try reloading the page.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">No info about these reviews yet</string>
+    <string name="review_quality_check_no_analysis_title">No info about these reviews yet</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">To know whether this product’s reviews are reliable, check the review quality. It only takes about 60 seconds.</string>
+    <string name="review_quality_check_no_analysis_body">To know whether this product’s reviews are reliable, check the review quality. It only takes about 60 seconds.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Check review quality</string>
+    <string name="review_quality_check_no_analysis_link">Check review quality</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Try our trusted guide to product reviews</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2307,11 +2332,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Open review checker</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Open Review quality check</string>
+    <string name="review_quality_check_open_handle_content_description">Open review checker</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Close review quality check</string>
+    <string name="review_quality_check_close_handle_content_description">Close review checker</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s out of 5 stars</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 3e43f760c..cd8b91db5 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -63,6 +63,19 @@
     <string name="private_browsing_placeholder_description_2">%1$s viŝas la serĉan kaj retuman historion de langetoj kiam vi fermas ilin aŭ finas la programon. Kvankam tio ne igas vin anonima antaŭ retejoj aŭ via retprovizanto, tio faciligas la taskon kaŝi vian retumon de aliaj uzantoj en tiu ĉi aparato.</string>
     <string name="private_browsing_common_myths">Oftaj mitoj pri privata retumo</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Lasu neniun spuron en tiu ĉi aparato</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">%1$s forigos viajn kuketojn, historion kaj retejajn datumojn kiam vi fermos ĉiujn viajn privatajn fenestrojn. %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">Kiu povus vidi mian retumon?</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">Malfermi vian venontan privatan langeton per unu tuŝo.</string>
@@ -85,6 +98,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Pli da informo pri totalan protekto kontraŭ kuketoj</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">Tuŝetu ĉi tie por komenci novan freŝan privatan seancon. Forigu vian historion, kuketojn — ĉion.</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">Aliro al la fimilo postulata. Iru al agordoj de Android, tuŝetu Permesojn kaj poste Permesi.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -221,6 +239,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Hejmekrano</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">Viŝi retuman historion</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Elektita lingvo</string>
@@ -297,16 +318,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ne nun</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Igi %s via ĉefa retumilo</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Igu Firefox via norma retumilo</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s metas personojn antaŭ profiton kaj defendas vian privatecon per blokado de interretejaj spuriloj.\n\nPli da informo en nia %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox metas personojn antaŭ profiton kaj defendas vian privatecon per blokado de interretejaj spuriloj.\n\nPli da informo en niaj notoj pri privateco.</string>
@@ -325,15 +339,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Komenci seancon</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ne nun</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Sciigoj helpas vin plenumi pli per %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Sciigoj helpas vin plenumi pli per Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Sendu langetojn inter aparatoj, administru elŝutojn kaj ricevu konsiletojn pri la maniero eltiri la maksimumon el %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Sendu langetojn inter aparatoj, administru elŝutojn kaj ricevu konsiletojn pri la maniero eltiri la maksimumon el Firefox.</string>
@@ -342,6 +350,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Ne nun</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Provu la komponanton serĉan de Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Kun Firefox en via hejmkerano vi havos facilan aliron al retumilo kiu zorgas unue pri via privateco kaj kiu blokas interretejajn spurilojn.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Aldoni komponanton de Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ne nun</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">Malfermi novan langeton de %1$s</string>
@@ -478,11 +498,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Alirebleco</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Personecigita servilo de konto de Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Personecigita servilo de konto de Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Personecigita servilo de konto de Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Personecigita servilo de spegulado</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">La serviloj de Konto de Firefox Account/Spegulado estis ŝanĝitaj. La programo nun finiĝos por apliki la ŝanĝojn…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">La serviloj de Konto de Firefox Account/Spegulado estis ŝanĝitaj. La programo nun finiĝos por apliki la ŝanĝojn…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">La agordoj de konto de Mozilla aŭ de spegulado ŝanĝiĝis. Apo finiĝas por apliki la ŝanĝojn…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -498,7 +522,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Komencu seancon por speguli langetojn, legosignojn, pasvortojn kaj pli.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Konto de Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Konto de Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Konto de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Rekonektiĝu por daŭrigi la speguladon</string>
     <!-- Preference for language -->
@@ -510,7 +536,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Fora sencimigo per USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Montri serĉilojn</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Montri serĉilojn</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Montri serĉajn sugestojn</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -529,6 +555,16 @@
     <string name="preferences_account_settings">Agordoj de konto</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Aŭtomate kompletigi retadresojn</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugestoj el patronoj</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">Subtenu %1$s per patronitaj sugestoj, de tempo al tempo</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">Sugestoj el %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Ricevu sugestojn el la reto, kiu rilatas vian serĉon</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Malfermi ligilojn per programoj</string>
 
@@ -630,13 +666,25 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Nesubtenata aldonaĵo</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Nesubtenata aldonaĵo</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">La aldonaĵo jam estas instalita</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">La aldonaĵo jam estas instalita</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">La aldonaĵoj estas provizore malaktivigitaj</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Unu aŭ pli da aldonaĴoj ĉesis funkcii, kaj tio igas vian sistemon nestabila. %1$s malsukcese klopodis restartigi la aldonaĵo(j)n.\n\nAldonaĵoj ne estos restartigitaj dum via nuna seanco.\n\nForigo aŭ malaktivigo de aldonaĵo(j) povus solvi tiun ĉi problemo.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Provi restartigi aldonaĵojn</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Daŭrigi kun aldonaĵoj malaktivigitaj</string>
 
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Administri konton</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Ŝanĝu vian pasvroton, administru datumkolekton aŭ forigu vian konton</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Speguli nun</string>
     <!-- Preference category for sync -->
@@ -1316,6 +1364,8 @@
     <string name="snackbar_private_tab_closed">Privata langeto fermita</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Privataj langetoj fermitaj</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Datumojn de privata retumo forigitaj</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">MALFARI</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1364,14 +1414,14 @@
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d langetoj</string>
 
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118">Retuma historio kaj retejaj datumoj</string>
+    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118" tools:ignore="UnusedResources">Retuma historio kaj retejaj datumoj</string>
     <!-- Title for the history item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_browsing_history_title">Historio de retumo</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d adresoj</string>
     <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118">Kuketoj</string>
+    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118" tools:ignore="UnusedResources">Kuketoj</string>
     <!-- Title for the cookies and site data items in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_and_site_data">Kuketoj kaj retejaj datumoj</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
@@ -1900,7 +1950,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Aldoni</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Konservi</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Konservi</string>
 
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modifi</string>
@@ -2151,6 +2201,174 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Iri al agordoj</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontrolilo de recenzoj</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Kontrolilo de recenzoj</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Fidindaj recenzoj</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Miksaĵo de fidindaj kaj nefindindaj recenzoj</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Nefindindaj recenzoj</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Kiel fidindaj estas tiuj recenzoj?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Alĝustigita taksado</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Nefidindaj recenzoj forigitaj</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Elstaraĵoj el ĵusaj recenzoj</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Nia maniero difini la kvaliton de recenzoj</string>
+
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Ni uzas artefaritan intelektan (AI) teknologion de %s (de Mozilla) por kontroli fidindecon de recenzoj de produktoj. Tio helpos vin nur taksi la kvaliton de recenzoj, ne la kvaliton de produktoj.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Ni donas al ĉiu recenzo de produkto <b>literan noton</b> el A ĝis F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Fidindaj recenzoj. Ni pensas ke tiuj venas el verŝajnaj veraj klientoj, kiuj donis sincerajn kaj objektivajn recenzojn.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Ni pensas ke tiuj recenzoj estas fidindaj.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Ni pensas ke estas miksaĵo de findindaj kaj nefidindaj recenzoj.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Nefidindaj recenzoj. Ni pensas ke tiuj estas verŝajne ĉu malveraj ĉu donitaj de neobjektivaj recenzintoj.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Ni pensas ke tiuj recenzoj estas nefidindaj.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>alĝustigita taksado</b> estas bazita nur sur la recenzoj, kiujn ni opinias fidindaj.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<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">Kiel %s (de Mozilla) determinas la kvaliton de recenzoj</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Agordoj</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Montri reklamojn en la kontrolilo de recenzoj</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">De tempo al tempo vi vidos reklamojn por elstaraj produktoj. Ĉiuj reklamoj devas konformi al niaj normoj pri kvalito de recenzoj. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">De tempo al tempo vi vidos reklamojn por elstaraj produktoj. Ni nur reklamas produktojn kun fidindaj recenzoj. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Pli da informo</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Malŝalti la kontrolilon de recenzoj</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Alternativaj produktoj</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Reklamo de %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">La kontrolilo de reklamoj funkcias danke al %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">La kontrolilo de reklamoj funkcias danke al %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s de Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Novaj kontrolendaj informoj</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Kontroli nun</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Ankoraŭ ne estas sufiĉe da recenzoj</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Kiam tiu ĉi produko havos pli da recenzoj, ni povis kontroli ĝian kvaliton.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Nedisponebla produkto</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se vi vidas ke denove estas stoko de tiu ĉi produko, raportu tion kaj ni kontrolos la recenzojn.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Raporti ke denove estas stoko de tiu ĉi produkto</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Raporti ke denove estas stoko de tiu ĉi produkto</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kvalito de recenzoj estas taksata</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kvalito de recenzoj estas taksata</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Tio povas postuli proksimume 60 sekundojn.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Dankon pro la raporto!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Ni devus havi informojn pri la recenzoj de tiu ĉi produkto dum la venontaj 24 horoj. Bonvolu rekontroli baldaŭ.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Ni ne povas kontroli tiujn recenzojn</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Bedaŭrinde ni ne povas kontroli la kvaliton de la recenzoj por kelkaj tipoj de produktoj. Ekzemple por donackartoj, retaj elsendoj, reta muziko kaj ludoj.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Baldaŭaj informoj</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Ni devus havi informojn pri la recenzoj de tiu ĉi produkto dum la venontaj 24 horoj. Bonvolu rekontroli baldaŭ.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">La analizo estas aktuala</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Mi komprenis</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Neniu informo havebla en tiu ĉi momento</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Ni klopodas solvi la problemon. Bonvolu rekontroli baldaŭ.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Ne estas retaliro</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Kontrolu vian retaliron kaj poste provu reŝargi la paĝon.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Ankoraŭ ne estas informoj pri tiuj recenzoj</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Por scii ĉu la recenzoj de tiu ĉi produkto estas fidindaj, kontrolu la kvaliton de recenzoj. Tio povas daŭri proksimume 60 sekundojn.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Kontroli kvaliton de recenzoj</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Provu nian fidindan gvidadon al recenzoj de produktoj</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Vidu kiel fidindaj estas la recenzoj en %1$s antaŭ ol aĉeti. La kontrolilo de recenzoj, eksperimenta trajto de %2$s, estas integrita en la retumilo kaj ĝi ankaŭ funkcias en %3$s kaj %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Danke al la povo de %1$s de Mozilla, ni helpas vin eviti neobjektivajn kaj malverajn recenzojn. Nia modelo de artefarita intelekto konstante pliboniĝas por protekti vin dum vi aĉetumas. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Pli da informo</string>
+
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Se vi elektas “Jes, provi ĝin” vi akceptas la %2$s kaj %3$s de %1$s de Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">politiko pri privateco</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">kondiĉoj de uzo</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Jes, provi ĝin</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ne nun</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Kontrolu ĉu vi povas fidi la recenzojn de tiu ĉi produkto — antaŭ ol aĉeti.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Provi la kontrolilon de recenzoj</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Ĉu tiuj recenzoj estas fidindaj? Kontrolu nun por vidi alĝustigitan taksadon.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Malfermi la kontrolilon de recenzoj</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Malfermi la kontrolilon de recenzoj</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Fermi la kontrolilo de recenzoj</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s el 5 steloj</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Montri malpli</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Montri pli</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Kvalito</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Prezo</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Liverado</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Pakado kaj aspekto</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Konkurenceco</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">faldi</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index a119b9a3e..f6c752480 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -330,16 +330,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">No ahora</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Hacer que %s sea tu navegador habitual</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Hacé de Firefox tu navegador favorito</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s pone a las personas por sobre las ganancias y defiende tu privacidad bloqueando rastreadores de sitios cruzados.\n\nConocé más en nuestra %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox pone a las personas por encima de las ganancias y defiende tu privacidad bloqueando los rastreadores entre sitios.\n\nMás información en nuestra nota de privacidad.</string>
@@ -358,15 +351,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Iniciar sesión</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">No ahora</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Enviá pestañas entre dispositivos, admisistrá descargas y recibí consejos para obtener el máximo de %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Enviá pestañas entre dispositivos, administrá descargas y recibí consejos para sacar el máximo provecho de Firefox.</string>
@@ -520,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilidad</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de cuenta de Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de cuenta de Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor personalizado de cuenta de Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor personalizado de Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Los servidores de cuenta de Firefox y Sync fueron modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Los servidores de cuenta de Firefox y Sync fueron modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Cuenta de Mozilla/servidor de Sync modificados. Saliendo de la aplicación para aplicar cambios…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cuenta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -540,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Iniciá la sesión para sincronizar pestañas, marcadores, contraseñas y más.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cuenta Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Cuenta Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Cuenta de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconectar para reanudar la sincronización</string>
     <!-- Preference for language -->
@@ -552,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuración remota vía USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Mostrar buscadores</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostrar buscadores</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugerencias de búsqueda</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -572,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocompletar URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugerencias de patrocinadores</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">Ayudar a %1$s con sugerencias patrocinadas ocasionales</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">Sugerencias de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Obtener sugerencias de la web relacionadas con tu búsqueda</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir enlaces en aplicaciones</string>
 
@@ -672,9 +675,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">El complemento no es compatible</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">El complemento no es compatible</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">El complemento ya está instalado</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">El complemento ya está instalado</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Los complementos están deshabilitados temporalmente</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Uno o más complementos dejaron de funcionar, haciendo que el sistema sea inestable. %1$s intentó reiniciar el(los) complemento(s) sin éxito.\n\nLos complementos no se reiniciarán durante la sesión actual.\n\nQuitar o deshabilitar los complementos puede solucionar este problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Probá reiniciar los complementos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar con los complementos deshabilitados</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -689,6 +702,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Administrar cuenta</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambiar la contraseña, administrar la recopilación de datos o eliminar la cuenta</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar ahora</string>
     <!-- Preference category for sync -->
@@ -1962,7 +1977,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Agregar</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Guardar</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Guardar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Editar</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2214,7 +2229,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verificador de revisiones</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de revisiones</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificador de revisiones</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Revisiones confiables</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2234,17 +2251,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Usamos tecnología de IA de %s de Mozilla para verificar la confiabilidad de las revisiones de productos. Esto solo te ayudará a evaluar la calidad de las reseñas, no la calidad del producto. </string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Asignamos a las revisiones de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Asignamos a las revisiones de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Revisiones confiables. Creemos que las revisiones probablemente provengan de clientes reales que dejaron revisiones honestas e imparciales.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las revisiones son confiables.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Creemos que hay una mezcla de revisiones confiables y no confiables.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Revisiones poco fiables. Creemos que las revisiones probablemente sean falsas o provengan de revisores sesgados.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las revisiones no son confiables.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>calificación ajustada</b> se basa únicamente en revisiones que consideramos confiables.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Los <b>destacados</b> provienen de revisiones de %s de los últimos 80 días que creemos que son confiables.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>destacados</b> provienen de revisiones de %s de los últimos 80 días que creemos que son confiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Conocer más sobre %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2254,7 +2275,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostrar publicidad en el verificador de revisiones</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verás publicidades ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisiones. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Verás publicidades ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisiones. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Solo anunciamos productos con revisiones confiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Conocer más</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2274,29 +2297,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Verificar ahora</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Aún no hay suficientes revisiones</string>
+    <string name="review_quality_check_no_reviews_warning_title">Aún no hay suficientes revisiones</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Cuando este producto tenga más revisiones, podremos verificar su calidad.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Cuando este producto tenga más revisiones, podremos verificar su calidad.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Producto no disponible</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si ves que este producto está nuevamente en stock, informanos y trabajaremos en verificar las revisiones.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este producto vuelve a estar en stock</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Informar que este producto vuelve a estar en stock</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Informar que el producto está en stock</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Verificando la calidad de la revisión</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Verificando la calidad de la revisión</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Verificando la calidad de la revisión</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Verificando la calidad de la revisión</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Esto puede tardar unos 60 segundos.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Esto puede tardar unos 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">¡Gracias por informarnos!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las revisiones de este producto en las próximas 24 horas. Volvé a chequear.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">No podemos comprobar estas revisiones</string>
+    <string name="review_quality_check_not_analyzable_info_title">No podemos comprobar estas revisiones</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Lamentablemente, no podemos verificar la calidad de las revisiones de ciertos tipos de productos. Por ejemplo, tarjetas de regalo y streaming de vídeos, música y juegos.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Lamentablemente, no podemos verificar la calidad de las revisiones de ciertos tipos de productos. Por ejemplo, tarjetas de regalo y streaming de vídeos, música y juegos.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">La información llegará pronto</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2306,19 +2331,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendido</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">No hay información disponible en este momento</string>
+    <string name="review_quality_check_generic_error_title">No hay información disponible en este momento</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Estamos trabajando para resolver este problema. Volvé a chequear pronto.</string>
+    <string name="review_quality_check_generic_error_body">Estamos trabajando para resolver este problema. Volvé a chequear pronto.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">No hay conexion de red</string>
+    <string name="review_quality_check_no_connection_title">No hay conexion de red</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Verificá tu conexión de red y luego intentá recargar la página.</string>
+    <string name="review_quality_check_no_connection_body">Verificá tu conexión de red y luego intentá recargar la página.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Aún no hay información sobre estas revisiones</string>
+    <string name="review_quality_check_no_analysis_title">Aún no hay información sobre estas revisiones</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Para saber si las revisiones de este producto son fiables, verificá la calidad de las revisiones. Solo toma unos 60 segundos.</string>
+    <string name="review_quality_check_no_analysis_body">Para saber si las revisiones de este producto son fiables, verificá la calidad de las revisiones. Solo toma unos 60 segundos.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Verificar la calidad de la revisión</string>
+    <string name="review_quality_check_no_analysis_link">Verificar la calidad de la revisión</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Probá nuestra guía confiable de revisiones de productos</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2346,11 +2371,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir el verificador de revisiones</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Verificación de calidad de revisión abierta</string>
+    <string name="review_quality_check_open_handle_content_description">Abrir el verificador de revisiones</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Cerrar control de calidad de revisión</string>
+    <string name="review_quality_check_close_handle_content_description">Cerrar el verificador de revisiones</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrellas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 87ddc6fdd..7512dcdff 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -322,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Haz de %s tu navegador para todo</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Haz de Firefox tu navegador para todo</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s pone a las personas por encima de las ganancias y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestro %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox pone a las personas por encima de las ganancias y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestra política de privacidad.</string>
@@ -350,15 +343,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Conectarse</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra las descargas y obtén sugerencias para aprovechar %s al máximo.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra las descargas y obtén sugerencias para aprovechar Firefox al máximo.</string>
@@ -512,11 +499,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilidad</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de cuenta de Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de cuenta de Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor personalizado de cuenta de Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor personalizado de Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servidores de cuenta de Mozilla y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cuenta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -533,7 +524,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Conéctate para sincronizar pestañas, marcadores, contraseñas y más.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cuenta de Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Cuenta de Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Cuenta de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconéctate para continuar la sincronización</string>
     <!-- Preference for language -->
@@ -545,7 +538,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuración remota vía USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Mostrar motores de búsqueda</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostrar motores de búsqueda</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugerencias de búsqueda</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -564,6 +557,16 @@
     <string name="preferences_account_settings">Ajustes de la cuenta</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocompletar URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugerencias de patrocinadores</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">Apoya a %1$s con sugerencias patrocinadas ocasionales</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">Sugerencias de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Recibe sugerencias de la web relacionadas con tu búsqueda</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir enlaces en aplicaciones</string>
 
@@ -665,9 +668,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Complemento no compatible</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Complemento no compatible</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Complemento ya está instalado</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Complemento ya está instalado</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Los complementos están temporalmente deshabilitados</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Uno o más complementos dejaron de funcionar, lo que hizo que tu sistema fuera inestable. %1$s intentó reiniciar los complementos sin éxito.\n\nLos complementos no se reiniciarán durante tu sesión actual.\n\nQuitar o deshabilitar los complementos puede solucionar este problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Intenta reiniciando los complementos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar con los complementos deshabilitados</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -682,6 +695,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Administrar cuenta</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambia tu contraseña, administra la recopilación de datos o elimina tu cuenta</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar ahora</string>
     <!-- Preference category for sync -->
@@ -1933,7 +1948,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Añadir</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Guardar</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Guardar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Editar</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2182,7 +2197,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verificador de reseñas</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de reseñas</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificador de reseñas</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Reseñas confiables</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2199,16 +2216,24 @@
     <string name="review_quality_check_highlights_title">Aspectos destacados de reseñas recientes</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
     <string name="review_quality_check_explanation_title">Cómo determinamos la calidad de las reseñas</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Usamos tecnología de IA de %s de Mozilla para verificar la confiabilidad de las reseñas de productos. Esto solo te ayudará a evaluar la calidad de las reseñas, no la calidad del producto. </string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Asignamos a las reseñas de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Revisiones confiables. Creemos que las reseñas probablemente provienen de clientes reales que dejaron reseñas honestas e imparciales.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas son confiables.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Creemos que hay una combinación de reseñas confiables y no confiables.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Reseñas poco fiables. Creemos que las reseñas probablemente son falsas o provienen de revisores sesgados.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas no son confiables.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>calificación ajustada</b> se basa únicamente en reseñas que consideramos confiables.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son confiables.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son confiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Aprender más sobre %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2218,7 +2243,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostrar anuncios en el verificador de reseñas</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisión. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisión. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Solo publicitaremos productos con reseñas confiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Aprender más</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2227,6 +2254,10 @@
     <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Más para considerar</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Anuncio de %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">El verificador de reseñas funciona con %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">El verificador de reseñas funciona con %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s de Mozilla</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2234,30 +2265,64 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Comprobar ahora</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Aún no hay suficientes reseñas</string>
+    <string name="review_quality_check_no_reviews_warning_title">Aún no hay suficientes reseñas</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Cuando este producto tenga más reseñas, podremos revisar su calidad.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">El producto no está disponible</string>
 
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si ves que este producto vuelve a estar disponible, infórmalo y trabajaremos para verificar las reseñas.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Informar que este producto volvió a estar disponible</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este producto volvió a estar disponible</string>
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Informar que el producto está en stock</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Comprobando la calidad de la reseña</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Comprobando la calidad de la reseña</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Esto podría tardar unos 60 segundos.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Esto podría tardar unos 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">¡Gracias por informar!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las reseñas de este producto dentro de 24 horas. Por favor, vuelve a revisar más tarde.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">No podemos comprobar estas reseñas</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Lamentablemente, no podemos verificar la calidad de las reseñas para ciertos tipos de productos. Por ejemplo, tarjetas de regalo y transmisión de vídeo, música y juegos.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">La información llegará pronto</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las reseñas de este producto dentro de 24 horas. Por favor, vuelve a revisar más tarde.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">El análisis está actualizado</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendido</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">No hay información disponible en este momento</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Estamos trabajando para resolver el problema. Por favor, vuelve a revisar en un rato.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Sin conexión de red</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Verifica tu conexión de red y luego intenta recargar la página.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Aún no hay información sobre estas reseñas</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Para saber si las reseñas de este producto son fiables, verifica la calidad de las reseñas. Sólo toma unos 60 segundos.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Comprobar la calidad de la reseña</string>
+    <string name="review_quality_check_no_analysis_link">Comprobar la calidad de la reseña</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Prueba nuestra guía confiable de reseñas de productos</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
     <string name="review_quality_check_contextual_onboarding_description">Mira cuán confiables son las reseñas de productos en %1$s antes de comprar. El verificador de reseñas, una función experimental de %2$s, está integrado directamente en el navegador. También funciona en %3$s y %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Usando el poder de %1$s de Mozilla, te ayudamos a evitar reseñas sesgadas y no auténticas. Nuestro modelo de IA siempre está mejorando para protegerte mientras compras. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Aprender más</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Sí, probarlo”, aceptas la %2$s y %3$s de %1$s de Mozilla.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2270,14 +2335,16 @@
     <string name="review_quality_check_first_cfr_message">Descubre si puedes confiar en las reseñas de este producto — antes de comprarlo.</string>
     <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Probar el verificador de reseñas</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">¿Son confiables estas reseñas? Verifica ahora para ver una calificación ajustada.</string>
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir verificador de reseñas</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Abrir verificador de calidad de reseñas</string>
+    <string name="review_quality_check_open_handle_content_description">Abrir verificador de reseñas</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Cerrar verificador de calidad de reseñas</string>
+    <string name="review_quality_check_close_handle_content_description">Cerrar verificador de reseñas</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrellas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
@@ -2290,6 +2357,8 @@
     <string name="review_quality_check_highlights_type_price">Precio</string>
     <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
     <string name="review_quality_check_highlights_type_shipping">Envío</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalaje y apariencia</string>
     <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
     <string name="review_quality_check_highlights_type_competitiveness">Competitividad</string>
 
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 64343af4e..dfaa49b40 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -328,17 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Haz de %s tu navegador favorito</string>
-
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Haz de Firefox tu navegador favorito</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s antepone las personas al lucro y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestro %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox antepone las personas al lucro y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestro aviso de privacidad.</string>
@@ -357,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Iniciar sesión</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra descargas y obtén consejos para aprovechar al máximo %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra descargas y obtén consejos para obtener el máximo de Firefox.</string>
@@ -521,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilidad</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de cuenta de Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de cuenta de Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor personalizado de cuenta de Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor personalizado de Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servidores de cuenta de Mozilla y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cuenta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -541,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Inicia sesión para sincronizar pestañas, marcadores, contraseñas y más.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cuenta Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Cuenta Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Cuenta de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconectar para reanudar la sincronización</string>
     <!-- Preference for language -->
@@ -553,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuración remota vía USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Mostrar buscadores</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mostrar buscadores</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugerencias de búsqueda</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -573,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocompletar URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugerencias de patrocinadores</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">Apoya a %1$s con sugerencias patrocinadas ocasionales</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">Sugerencias de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Recibir sugerencias de la web relacionadas con tu búsqueda</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir enlaces en aplicaciones</string>
 
@@ -673,9 +675,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">El complemento no es compatible</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">El complemento no es compatible</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">El complemento ya está instalado</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">El complemento ya está instalado</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Los complementos están desactivados temporalmente</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Uno o más complementos han dejado de funcionar, lo que ha hecho que tu sistema sea inestable. %1$s ha intentado reiniciar los complementos sin éxito.\n\nLos complementos no se reiniciarán durante tu sesión actual.\n\nQuitar o deshabilitar los complementos puede solucionar este problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Intenta reiniciando los complementos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar con los complementos desactivados</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -690,6 +702,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Administrar cuenta</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambiar la contraseña, administrar la recopilación de datos o eliminar la cuenta</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar ahora</string>
     <!-- Preference category for sync -->
@@ -1972,7 +1986,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Añadir</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Guardar</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Guardar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Editar</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2223,7 +2237,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verificador de reseñas</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificador de reseñas</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificador de reseñas</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Reseñas fiables</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2243,17 +2259,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Utilizamos tecnología de IA de %s por Mozilla para analizar la fiabilidad de las reseñas de productos. Este análisis solo ayudará a evaluar la calidad de las reseñas, no la calidad del producto.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Asignamos a las reseñas de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Asignamos a las reseñas de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Revisiones fiables. Creemos que las reseñas probablemente provienen de clientes reales que dejaron reseñas honestas e imparciales.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas son fiables.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Creemos que hay una combinación de reseñas fiables y no fiables.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Reseñas poco fiables. Creemos que las reseñas probablemente son falsas o provienen de revisores sesgados.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas no son fiables.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>calificación ajustada</b> se basa únicamente en reseñas que consideramos fiables.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son fiables.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son fiables.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saber más sobre %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2263,7 +2283,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostrar anuncios en el verificador de reseñas</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisión. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisión. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verá anuncios ocasionales de productos relevantes. Solo anunciamos productos con revisiones fiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Saber más</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2283,29 +2305,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Comprobar ahora</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Aún no hay suficientes reseñas</string>
+    <string name="review_quality_check_no_reviews_warning_title">Aún no hay suficientes reseñas</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Cuando este producto tenga más reseñas, podremos analizar su calidad.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Cuando este producto tenga más reseñas, podremos analizar su calidad.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">El producto no está disponible</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si ves que este producto vuelve a estar disponible, infórmanos y trabajaremos para actualizar el análisis.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este producto vuelve a estar disponible</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Informar que este producto vuelve a estar disponible</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Informar que el producto está en stock</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Comprobando la calidad de la reseña</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Comprobando la calidad de la reseña</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Esto podría tardar unos 60 segundos.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Esto podría tardar unos 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">¡Gracias por informar!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las reseñas de este producto en 24 horas. Por favor, vuelve a comprobarlo más tarde.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">No podemos comprobar estas reseñas</string>
+    <string name="review_quality_check_not_analyzable_info_title">No podemos comprobar estas reseñas</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Lamentablemente, no podemos verificar la calidad de las reseñas para ciertos tipos de productos. Por ejemplo, tarjetas de regalo y transmisión de vídeo, música y juegos.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Lamentablemente, no podemos verificar la calidad de las reseñas para ciertos tipos de productos. Por ejemplo, tarjetas de regalo y transmisión de vídeo, música y juegos.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Información disponible en breve</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2315,19 +2339,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendido</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">No hay información disponible en este momento</string>
+    <string name="review_quality_check_generic_error_title">No hay información disponible en este momento</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Estamos trabajando para resolver el problema. Por favor, vuelve a comprobarlo en breve.</string>
+    <string name="review_quality_check_generic_error_body">Estamos trabajando para resolver el problema. Por favor, vuelve a comprobarlo en breve.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">No hay conexión de red</string>
+    <string name="review_quality_check_no_connection_title">No hay conexión de red</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Verifica tu conexión de red y prueba a recargar la página.</string>
+    <string name="review_quality_check_no_connection_body">Verifica tu conexión de red y prueba a recargar la página.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Aún no hay información sobre estas reseñas</string>
+    <string name="review_quality_check_no_analysis_title">Aún no hay información sobre estas reseñas</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Para saber si las reseñas de este producto son fiables, verifica la calidad de las reseñas. Sólo lleva unos 60 segundos.</string>
+    <string name="review_quality_check_no_analysis_body">Para saber si las reseñas de este producto son fiables, verifica la calidad de las reseñas. Sólo lleva unos 60 segundos.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Comprobar la calidad de la reseña</string>
+    <string name="review_quality_check_no_analysis_link">Comprobar la calidad de la reseña</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Prueba nuestra fiable guía de reseñas de productos</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2355,11 +2379,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir el verificador de reseñas</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Abrir el verificador de calidad de reseñas</string>
+    <string name="review_quality_check_open_handle_content_description">Abrir el verificador de reseñas</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Cerrar el verificador de calidad de reseñas</string>
+    <string name="review_quality_check_close_handle_content_description">Cerrar el verificador de reseñas</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrellas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ec89416b2..b34eb06bb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -68,6 +68,19 @@
     <string name="private_browsing_common_myths">
        Mitos comunes sobre la navegación privada</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">No dejar rastro en este dispositivo</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">%1$s elimina tus cookies, historial y datos del sitio cuando cierras todas tus ventanas privadas. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">¿Quién podría ver mi actividad?</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">Lanza la siguiente pestaña privada con un solo toque.</string>
@@ -90,6 +103,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Saber más sobre la protección total contra las cookies</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">Pulsa aquí para iniciar una nueva sesión privada. Borra tu historial, las cookies… todo.</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">Se necesita acceso a la cámara. Ve a la configuración de Android, pulsa Permisos y luego Permitir.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -229,6 +247,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Pantalla de inicio</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">Eliminar historial de navegación</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -307,17 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ahora no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Haz de %s tu navegador favorito</string>
-
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Haz de Firefox tu navegador favorito</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s antepone las personas al lucro y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestro %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox antepone las personas al lucro y defiende tu privacidad al bloquear los rastreadores entre sitios.\n\nObtén más información en nuestro aviso de privacidad.</string>
@@ -336,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Iniciar sesión</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ahora no</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Las notificaciones te ayudan a hacer más con Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra descargas y obtén consejos para aprovechar al máximo %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Envía pestañas entre dispositivos, administra descargas y obtén consejos para obtener el máximo de Firefox.</string>
@@ -353,6 +360,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Ahora no</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Prueba el widget de búsqueda de Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Con Firefox en tu pantalla de inicio, tendrás fácil acceso al navegador que prioriza la privacidad y bloquea los rastreadores entre sitios.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Añadir widget de Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ahora no</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">Abrir una pestaña nueva de %1$s</string>
@@ -488,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accesibilidad</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de cuenta de Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de cuenta de Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor personalizado de cuenta de Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor personalizado de Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidores de cuenta de Firefox y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servidores de cuenta de Mozilla y Sync modificados. Cerrando la aplicación para aplicar los cambios…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Cuenta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -508,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Inicia sesión para sincronizar pestañas, marcadores, contraseñas y más.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Cuenta Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Cuenta Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Cuenta de Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconectar para reanudar la sincronización</string>
     <!-- Preference for language -->
@@ -540,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocompletar URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugerencias de patrocinadores</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">Apoya a %1$s con sugerencias patrocinadas ocasionales</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">Sugerencias de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Recibir sugerencias de la web relacionadas con tu búsqueda</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir enlaces en aplicaciones</string>
 
@@ -1348,6 +1383,8 @@
     <string name="snackbar_private_tab_closed">Pestaña privada cerrada</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Pestañas privada cerradas</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Se han eliminado los datos de navegación privada</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">DESHACER</string>
 
@@ -2186,6 +2223,166 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ir a ajustes</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Verificador de reseñas</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Reseñas fiables</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mezcla de reseñas fiables y no fiables</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Reseñas no fiables</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">¿Son fiables estas reseñas?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Calificación ajustada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Se han eliminado las reseñas no fiables</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Aspectos destacados de reseñas recientes</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Cómo determinamos la calidad de las reseñas</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Utilizamos tecnología de IA de %s por Mozilla para analizar la fiabilidad de las reseñas de productos. Este análisis solo ayudará a evaluar la calidad de las reseñas, no la calidad del producto.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Asignamos a las reseñas de cada producto una <b>calificación con letras</b> de la A a la F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Revisiones fiables. Creemos que las reseñas probablemente provienen de clientes reales que dejaron reseñas honestas e imparciales.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas son fiables.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Creemos que hay una combinación de reseñas fiables y no fiables.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Reseñas poco fiables. Creemos que las reseñas probablemente son falsas o provienen de revisores sesgados.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Creemos que las reseñas no son fiables.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>calificación ajustada</b> se basa únicamente en reseñas que consideramos fiables.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Los <b>puntos destacados</b> provienen de reseñas de %s de los últimos 80 días que creemos que son fiables.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Saber más sobre %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">cómo %s de Mozilla determina la calidad de las reseñas</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Ajustes</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Mostrar anuncios en el verificador de reseñas</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verás anuncios ocasionales de productos relevantes. Todos los anuncios deben cumplir con nuestros estándares de calidad de revisión. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Saber más</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Desactivar el verificador de reseñas</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Más para considerar</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Anuncio de %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">El verificador de reseñas funciona gracias a %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">El verificador de reseñas funciona gracias a %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s de Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Nueva información para comprobar</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Comprobar ahora</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Aún no hay suficientes reseñas</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Cuando este producto tenga más reseñas, podremos analizar su calidad.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">El producto no está disponible</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si ves que este producto vuelve a estar disponible, infórmanos y trabajaremos para actualizar el análisis.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este producto vuelve a estar disponible</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Comprobando la calidad de la reseña</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Esto podría tardar unos 60 segundos.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">¡Gracias por informar!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las reseñas de este producto en 24 horas. Por favor, vuelve a comprobarlo más tarde.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">No podemos comprobar estas reseñas</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Lamentablemente, no podemos verificar la calidad de las reseñas para ciertos tipos de productos. Por ejemplo, tarjetas de regalo y transmisión de vídeo, música y juegos.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Información disponible en breve</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Deberíamos tener información sobre las reseñas de este producto en 24 horas. Por favor, vuelve a comprobarlo más tarde.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">El análisis está actualizado</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendido</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">No hay información disponible en este momento</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Estamos trabajando para resolver el problema. Por favor, vuelve a comprobarlo en breve.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">No hay conexión de red</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Verifica tu conexión de red y prueba a recargar la página.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Aún no hay información sobre estas reseñas</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Para saber si las reseñas de este producto son fiables, verifica la calidad de las reseñas. Sólo lleva unos 60 segundos.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Comprobar la calidad de la reseña</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Prueba nuestra fiable guía de reseñas de productos</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Comprueba lo fiables que son las reseñas de productos en %1$s antes de comprar. El verificador de reseñas, una función experimental de %2$s, está integrado directamente en el navegador. También funciona en %3$s y %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Utilizando la tecnología de %1$s de Mozilla, te ayudamos a evitar reseñas sesgadas y no auténticas. Nuestro modelo de IA siempre mejora para protegerte mientras compras. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Saber más</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Al seleccionar “Sí, probarlo”, aceptas %1$s de %2$s y %3$s de Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidad</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">términos de uso</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Si, probarlo</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ahora no</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Descubre si puedes confiar en las reseñas de este producto — antes de comprarlo.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Probar el verificador de reseñas</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">¿Son fiables estas revisiones? Consúltalo ahora para ver una calificación ajustada.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir el verificador de reseñas</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Abrir el verificador de reseñas</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Cerrar el verificador de reseñas</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrellas</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Mostrar menos</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Mostrar más</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Calidad</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Precio</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Envío</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalaje y apariencia</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitividad</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">contraer</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dda6686d0..8f5f5bdc2 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -67,6 +67,19 @@
        Nabigatze pribatuari buruzko ohiko mitoak
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ez utzi arrastorik gailu honetan</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">%1$s(e)k zure cookieak, historia eta guneetako datuak ezabatzen ditu leiho pribatu guztiak ixten dituzunean. %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">Nork ikus lezake nire jarduera?</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">Sakatu behin zure hurrengo fitxa pribatua irekitzeko.</string>
@@ -89,6 +102,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Cookien erabateko babesari buruzko argibide gehiago</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">Sakatu hemen nabigatze pribatuko saioa hasteko. Ezabatu zure historia, cookieak — dena.</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">Kamerarako sarbidea behar da. Joan Androideko ezarpenetara, sakatu baimenetan eta sakatu baimendu.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -227,6 +245,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Hasiera-pantaila</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">Ezabatu nabigatze-historia</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Hautatutako hizkuntza</string>
@@ -350,6 +371,19 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Une honetan ez</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Probatu Firefoxen bilaketa widget-a</string>
+
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Firefox zure hasierako pantailan dela, sarbide zuzena izango duzu pribatutasuna hobesten eta guneen arteko jarraipen elementuak blokeatzen dituen nabigatzailera.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Gehitu Firefox widget-a</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Une honetan ez</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">Ireki %1$s fitxa berria</string>
@@ -1330,6 +1364,8 @@
     <string name="snackbar_private_tab_closed">Fitxa pribatua itxita</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Fitxa pribatuak itxita</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Nabigatze pribatuko datuak ezabatuta</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">DESEGIN</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -2158,6 +2194,164 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Joan ezarpenetara</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Balorazioen egiaztatzailea</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Balorazio fidagarriak</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Balorazio fidagarri eta fidagaitzen nahasketa</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Balorazio fidagaitzak</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Zenbateraino dira fidagarriak balorazio hauek?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Egokitutako balorazioa</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Balorazio fidagaitzak kenduta</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Azken balorazioetan nabarmentzekoak</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Nola antzematen dugun balorazioen kalitatea</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Mozillaren %s Adimen Artifizial (AA) teknologia erabiltzen dugu produktuen balorazioen fidagarritasuna egiaztatzeko. Honek balorazioen kalitatea neurtzen lagunduko dizu, ez produktuen kalitatea.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Produktuen balorazioei A eta F arteko <b>letra maila</b> bat esleitzen diegu.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Balorazio fidagarriak. Uste dugu balorazioak benetako bezeroenak direla eta zintzo eta aurreiritzirik gabe utzi dituztela.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Uste dugu balorazio fidagarri eta fidagaitzen arteko nahasketa bat dagoela.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Balorazio fidagaitzak. Uste dugu balorazioak ziurrenik faltsuak direla edo kritika aurreiritzidunak dituztela.</string>
+
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Egokitutako balorazioa</b> fidagarriak direla uste ditugun balorazioetan dago oinarrituta soilik.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![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">Mozillaren %s(e)k nola antzematen duen balorazioen kalitatea</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Ezarpenak</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Erakutsi iragarkiak balorazioen egiaztatzailean</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Tarteka iragarkiak ikusiko dituzu produktu aproposentzat. Iragarki guztiek gure berrikuspenen kalitate-estandarrak bete behar dituzte. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Argibide gehiago</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Desgaitu balorazioen egiaztatzailea</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Kontuan hartzeko gehiago</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">%s(r)en iragarkia</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Balorazioen egiaztatzailea %s(e)k hornituta.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Balorazioen egiaztatzailea %s(e)k hornituta</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">Mozillaren %s</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Egiaztatu beharreko informazio berria</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Egiaztatu orain</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Balorazio nahikorik ez oraindik</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Produktu honek balorazio gehiago dituenean, hauen kalitatea egiaztatu ahal izango dugu.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produktua ez dago erabilgarri</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Produktua berriz ere erabilgarri dagoela ikusten baduzu, jakinaraz iezaguzu eta balorazioak egiaztatzeari ekingo diogu.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Jakinarazi produktu hau berriz ere erabilgarri dagoela</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Balorazioaren kalitatea egiaztatzen</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Balorazioaren kalitatea egiaztatzen</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">60 bat segundo har litzake honek.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Eskerrik asko jakinarazpenagatik!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Produktu honen balorazioei buruzko informazioa 24 ordu barru izan behar genuke. Itzuli geroago mesedez.</string>
+
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Ezin ditugu balorazio hauek egiaztatu</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Tamalez ezin dugu zenbait produktu moten balorazioen kalitatea egiaztatu. Adibidez, opari-txartelenak eta streaming bideo, musika eta bideoenak.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informazioa laster egongo da erabilgarri</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Produktu honen balorazioei buruzko informazioa 24 ordu barru izan behar genuke. Itzuli geroago mesedez.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analisia eguneratuta dago</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Ulertuta</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Ez dago informaziorik erabilgarri</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Arazoa konpontzen saiatzen ari gara. Itzuli geroago mesedez.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Sareko konexiorik ez</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Egiaztatu sareko zure konexioa eta saiatu orria berritzen.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Balorazio hauei buruzko informaziorik ez oraindik</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Produktu hauen balorazioak fidatzekoak diren jakiteko, egiaztatu balorazioen kalitatea. 60 bat segundo hartzen ditu soilik.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Egiaztatu balorazioaren kalitatea</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Probatu produktuen balorazioetarako gure fidatzeko gida</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Erosi aurretik, ikusi %1$s(e)ko produktuen balorazioak zenbateraino diren fidagarriak. Balorazioen egiaztatzailea, %2$s(e)n eginbide esperimentala, nabigatzailean integratuta dago. %3$s eta %4$s(e)n ere badabil.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Mozillaren %1$s(r)en teknologia erabiliz, balorazio aurreiritzidun eta egiazkoak ez direnak saihesten laguntzen dizugu. Gure Adimen Artifizialeko modeloa uneoro ari da hobetzen zure erosketak babesteko. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Argibide gehiago</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">&quot;Bai, probatu&quot; aukeratuta, Mozillaren %1$s(r)en %2$s eta %3$s onartzen dituzu.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">pribatutasun-politika</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">erabilera-baldintzak</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Bai, probatu</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Une honetan ez</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Ikusi ea produktu honen balorazioak fidagarriak diren — erosi aurretik.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Probatu balorazioen egiaztatzailea</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Fidagarriak dira balorazio hauek? Egiaztatu orain egokitutako balorazioa ikusteko.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Ireki balorazioen egiaztatzailea</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Ireki balorazioen egiaztatzailea</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Itxi balorazioen egiaztatzailea</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s / 5 izar</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Erakutsi gutxiago</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Erakutsi gehiago</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Kalitatea</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Prezioa</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Bidalketa</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Paketatzea eta itxura</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Lehiakortasuna</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">tolestu</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2c3020b39..21122245d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -328,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ei nyt</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Aseta %s selaimeksesi</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Aseta Firefox selaimeksesi</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s asettaa ihmiset voittojen edelle ja suojaa yksityisyyttäsi estämällä sivustojen väliset seuraimet.\n\nLisätietoja on %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox asettaa ihmiset voittojen edelle ja suojaa yksityisyyttäsi estämällä sivustojen väliset seuraimet.\n\nLisätietoja on tietosuojaselosteessamme.</string>
@@ -356,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Kirjaudu sisään</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ei nyt</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Ilmoitukset auttavat sinua tekemään enemmän %silla</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Ilmoitukset auttavat sinua tekemään enemmän Firefoxilla</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Lähetä välilehtiä laitteiden välillä, hallitse latauksia ja saa vinkkejä, joiden avulla saat kaiken irti %sista.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Lähetä välilehtiä laitteiden välillä, hallitse latauksia ja saa vinkkejä, joiden avulla saat kaiken irti Firefoxista.</string>
@@ -520,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Saavutettavuus</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Mukautettu Firefox-tilin palvelin</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Mukautettu Firefox-tilin palvelin</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Mukautettu Mozilla-tilin palvelin</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Mukautettu synkronointipalvelin</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox-tilin tai synkronoinnin palvelinta muutettu. Lopetetaan sovellus, jotta muutokset tulevat voimaan…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-tilin tai synkronoinnin palvelinta muutettu. Lopetetaan sovellus, jotta muutokset tulevat voimaan…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-tilin tai synkronoinnin palvelinta muutettu. Lopetetaan sovellus, jotta muutokset tulevat voimaan…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Tili</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -540,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Kirjaudu sisään synkronoidaksesi välilehtesi, kirjanmerkkisi, salasanasi ja muita tietoja.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-tili</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-tili</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-tili</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Yhdistä uudelleen jatkaaksesi synkronointia</string>
     <!-- Preference for language -->
@@ -552,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Etävianjäljitys USB:n kautta</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Näytä hakukoneet</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Näytä hakukoneet</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Näytä hakuehdotukset</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -572,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Täydennä osoitteet automaattisesti</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Ehdotuksia sponsoreilta</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">Tue %1$sia satunnaisilla sponsoroiduilla ehdotuksilla</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">Ehdotuksia %1$silta</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Vastaanota ehdotuksia verkosta hakuusi liittyen</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Avaa linkit sovelluksissa</string>
 
@@ -673,9 +676,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Lisäosa ei ole tuettu</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Lisäosa ei ole tuettu</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Lisäosa on jo asennettu</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Lisäosa on jo asennettu</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Lisäosat on väliaikaisesti poistettu käytöstä</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Yksi tai useampi lisäosa lakkasi toimimasta, mikä teki järjestelmästä epävakaan. %1$s ei onnistunut käynnistämään lisäosia uudelleen.\n\nLisäosia ei käynnistetä uudelleen nykyisen istunnon aikana.\n\nLisäosien poistaminen tai poistaminen käytöstä saattaa korjata tämän ongelman.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Yritä käynnistää lisäosat uudelleen</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Jatka lisäosien ollessa poistettu käytöstä</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -690,6 +703,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Hallitse tiliä</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Vaihda salasanasi, hallitse tiedonkeruuta tai poista tilisi</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synkronoi nyt</string>
     <!-- Preference category for sync -->
@@ -1956,7 +1971,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Lisää</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Tallenna</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Tallenna</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Muokkaa</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2207,7 +2222,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Arvostelun tarkistin</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Arvostelun tarkistin</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Arvostelun tarkistin</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Luotettavat arvostelut</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2224,18 +2241,24 @@
     <string name="review_quality_check_highlights_title">Kohokohdat viimeaikaisista arvosteluista</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
     <string name="review_quality_check_explanation_title">Kuinka määritämme arvostelun laadun</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Käytämme Mozillan %s-tekoälytekniikkaa tuotearvioiden luotettavuuden tarkistamiseen. Tämä auttaa arvioimaan vain arvostelun laatua, ei tuotteen laatua. </string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Annamme kunkin tuotteen arvosteluille <b>kirjainarvosanan</b> A:sta F:ään.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Annamme kunkin tuotteen arvosteluille <b>kirjainarvosanan</b> A:sta F:ään.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Luotettavat arvostelut. Uskomme, että arvostelut ovat todennäköisesti todellisilta asiakkailta, jotka ovat jättäneet rehellisiä, puolueettomia arvosteluja.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Uskomme, että arvostelut ovat luotettavia.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Uskomme, että kyseessä on sekä luotettavia että epäluotettavia arvosteluja.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Epäluotettavat arvostelut. Uskomme, että arvostelut ovat todennäköisesti vääriä tai puolueellisia.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Uskomme, etteivät arvostelut ole luotettavia.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Oikaistu arvosana</b> perustuu vain niihin arvosteluihin, jotka koemme luotettaviksi.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Kohokohdat</b> ovat %s arvostelusta viimeisten 80 päivän ajalta, joiden uskomme olevan luotettavia.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Kohokohdat</b> ovat %s arvostelusta viimeisten 80 päivän ajalta, joiden uskomme olevan luotettavia.]]></string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Asetukset</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
@@ -2252,32 +2275,36 @@
     <string name="review_quality_check_powered_by_2">Arvostelujen tarkistuksen tarjoaa %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s Mozillalta</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Uusia tietoja tarkistettavaksi</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Tarkista nyt</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ei vielä tarpeeksi arvosteluja</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ei vielä tarpeeksi arvosteluja</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Kun tästä tuotteesta on enemmän arvosteluja, voimme tarkistaa niiden laadun.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Kun tästä tuotteesta on enemmän arvosteluja, voimme tarkistaa niiden laadun.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Tuote ei ole saatavilla</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Jos huomaat, että tämä tuote on jälleen varastossa, ilmoita siitä, niin tarkistamme arvostelut.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Ilmoita, että tämä tuote on jälleen varastossa</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Ilmoita, että tämä tuote on jälleen varastossa</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Ilmoita, että tuoteta on varastossa</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Tarkistetaan arvostelun laatua</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Tarkistetaan arvostelun laatua</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Tarkistetaan arvostelun laatua</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Tarkistetaan arvostelun laatua</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Tämä voi kestää noin 60 sekuntia.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Tämä voi kestää noin 60 sekuntia.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Kiitos ilmoituksesta!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Meillä pitäisi olla tietoa tämän tuotteen arvosteluista 24 tunnin sisällä. Tarkista tilanne uudelleen.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Emme voi tarkistaa näitä arvosteluja</string>
+    <string name="review_quality_check_not_analyzable_info_title">Emme voi tarkistaa näitä arvosteluja</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Valitettavasti emme voi tarkistaa arvostelun laatua tietyntyyppisten tuotteiden osalta. Esimerkiksi lahjakortit ja suoratoistovideot, musiikki ja pelit.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Valitettavasti emme voi tarkistaa arvostelun laatua tietyntyyppisten tuotteiden osalta. Esimerkiksi lahjakortit ja suoratoistovideot, musiikki ja pelit.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Tietoa tulossa pian</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2287,17 +2314,17 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Selvä</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Tietoja ei juuri nyt saatavilla</string>
+    <string name="review_quality_check_generic_error_title">Tietoja ei juuri nyt saatavilla</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Pyrimme ratkaisemaan ongelman. Tarkista tilanne pian uudelleen.</string>
+    <string name="review_quality_check_generic_error_body">Pyrimme ratkaisemaan ongelman. Tarkista tilanne pian uudelleen.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Ei verkkoyhteyttä</string>
+    <string name="review_quality_check_no_connection_title">Ei verkkoyhteyttä</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Tarkista verkkoyhteytesi ja yritä sitten ladata sivu uudelleen.</string>
+    <string name="review_quality_check_no_connection_body">Tarkista verkkoyhteytesi ja yritä sitten ladata sivu uudelleen.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Näistä arvosteluista ei ole vielä tietoa</string>
+    <string name="review_quality_check_no_analysis_title">Näistä arvosteluista ei ole vielä tietoa</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Tarkista arvostelun laatu</string>
+    <string name="review_quality_check_no_analysis_link">Tarkista arvostelun laatu</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Lue lisää</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
@@ -2313,9 +2340,9 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Avaa arvostelujen tarkistus</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Avaa arvostelun laaduntarkistus</string>
+    <string name="review_quality_check_open_handle_content_description">Avaa arvostelujen tarkistus</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Sulje arvostelun laaduntarkistus</string>
+    <string name="review_quality_check_close_handle_content_description">Sulje arvostelujen tarkistus</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s/5 tähteä</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3af26341e..735a74353 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -66,6 +66,20 @@
     <string name="private_browsing_placeholder_description_2">%1$s efface vos historiques de recherche et de navigation des onglets privés lorsque vous les fermez ou quittez l’application. Bien que cela ne vous rende pas anonyme sur les sites web ni pour votre fournisseur d’accès à Internet, cela vous permet de garder confidentielle votre activité en ligne pour toutes les autres personnes qui utiliseraient votre appareil.</string>
     <string name="private_browsing_common_myths">Principales idées reçues sur la navigation privée</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ne laissez aucune trace sur cet appareil</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">%1$s efface cookies, historique de navigation et données de sites lorsque vous fermez toutes les fenêtres de navigation privée. %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">Qui peut voir mon activité ?</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">Lancez votre prochain onglet privé d’un seul doigt.</string>
@@ -90,6 +104,11 @@
     <string name="tcp_cfr_learn_more">En savoir plus sur la protection totale contre les cookies</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">Appuyez ici pour lancer une nouvelle session de navigation privée. Supprimez historique, cookies — tout.</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">Accès à la caméra nécessaire. Accédez aux paramètres Android, appuyez sur Autorisations, puis sur Autoriser.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -228,6 +247,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Écran d’accueil</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">Effacer l’historique de navigation</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Langue sélectionnée</string>
@@ -306,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Plus tard</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Faites de %s votre navigateur par défaut</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Faites de Firefox votre navigateur par défaut</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s fait passer les gens avant l’argent et défend votre vie privée en bloquant les traqueurs intersites.\n\nApprenez-en davantage dans notre %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox fait passer les gens avant l’argent et défend votre vie privée en bloquant les traqueurs intersites.\n\nApprenez-en davantage dans notre politique de confidentialité.</string>
@@ -334,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Connexion</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Plus tard</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Les notifications vous aident à en faire plus avec %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Les notifications vous aident à en faire plus avec Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Partagez des onglets entre vos appareils, gérez les téléchargements et obtenez des conseils pour tirer le meilleur parti de %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Partagez des onglets entre vos appareils, gérez les téléchargements et obtenez des conseils pour tirer le meilleur parti de Firefox.</string>
@@ -351,6 +360,19 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Plus tard</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Essayez le widget de recherche de Firefox</string>
+
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Mettez Firefox sur votre écran d’accueil pour un accès facile au navigateur axé sur le respect de la vie privée qui bloque les traqueurs intersites.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Ajouter le widget Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Plus tard</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">Ouvrir un nouvel onglet %1$s</string>
@@ -485,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilité</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Serveur de compte Firefox personnalisé</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Serveur de compte Firefox personnalisé</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Serveur de compte Mozilla personnalisé</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Serveur de synchronisation personnalisé</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Serveur de synchronisation/de compte Firefox modifié. Fermeture de l’application pour appliquer les modifications…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Serveur de synchronisation/de compte Firefox modifié. Fermeture de l’application pour appliquer les modifications…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Serveur pour la synchronisation ou le compte Mozilla modifié. Fermeture de l’application pour appliquer les modifications…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Compte</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -505,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Connectez-vous pour synchroniser onglets, marque-pages, mots de passe et bien plus.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Compte Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Compte Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Compte Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconnectez-vous pour reprendre la synchronisation</string>
     <!-- Preference for language -->
@@ -517,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Débogage distant par USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Afficher les moteurs de recherche</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Afficher les moteurs de recherche</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Afficher les suggestions de recherche</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -537,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Compléter automatiquement les URL</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestions de sponsors</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">Soutenir %1$s en affichant de temps en temps des suggestions sponsorisées</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">Suggestions de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Obtenir des suggestions du Web en rapport avec votre recherche</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Ouvrir les liens dans des applications</string>
 
@@ -637,9 +675,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Ce module complémentaire n’est pas pris en charge</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Ce module complémentaire n’est pas pris en charge</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Ce module complémentaire est déjà installé</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Ce module complémentaire est déjà installé</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Modules complémentaires temporairement désactivés</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Un module complémentaire, ou plusieurs, a cessé de fonctionner entraînant l’instabilité de votre système. %1$s a tenté de le (ou les) redémarrer sans succès.\n\nCes modules complémentaires ne seront pas redémarrés pendant la session actuelle.\n\nSupprimer ou désactiver les modules complémentaires peut résoudre le problème.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Essayer de redémarrer les modules</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuer avec les modules désactivés</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -654,6 +702,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gérer le compte</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Changer votre mot de passe, gérer la collecte de données ou supprimer votre compte</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchroniser maintenant</string>
     <!-- Preference category for sync -->
@@ -1348,6 +1398,8 @@
     <string name="snackbar_private_tab_closed">Onglet privé fermé</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Onglets privés fermés</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Données de navigation privée supprimées</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ANNULER</string>
 
@@ -1931,7 +1983,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Ajouter</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Enregistrer</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Enregistrer</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modifier</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2181,7 +2233,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Vérificateur d’avis</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Vérificateur d’avis</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Vérificateur d’avis</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Avis fiables</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2191,50 +2245,144 @@
     <!-- Text for title presenting the reliability of a product's reviews. -->
     <string name="review_quality_check_grade_title">Quelle est la fiabilité de ces avis ?</string>
     <!-- Title for when the rating has been updated by the review checker -->
-    <string name="review_quality_check_adjusted_rating_title">Note ajustée</string>
+    <string name="review_quality_check_adjusted_rating_title">Évaluation corrigée</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description">Avis non fiables supprimés</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Points essentiels des avis récents</string>
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
     <string name="review_quality_check_explanation_title">Comment nous déterminons la qualité d’un avis</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Nous utilisons la technologie d’intelligence artificielle %s par Mozilla pour vérifier la fiabilité des avis sur des produits. Ce qui vous aide seulement à évaluer la qualité des avis, mais non la qualité des produits.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Nous attribuons une <b>notation alphabétique</b> aux avis sur chaque produit, allant de A à F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Avis fiables. Nous pensons que les avis proviennent probablement de véritables client·e·s qui ont laissé des avis sincères et objectifs.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nous pensons que ces avis sont fiables.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Nous pensons que les avis regroupent des avis fiables et non fiables.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Avis non fiables. Nous pensons que les avis sont probablement contrefaits ou proviennent d’utilisateurs partiaux.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nous pensons que ces avis ne sont pas fiables.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[L’<b>évaluation corrigée</b> se fonde uniquement sur les avis que nous considérons fiables.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Les <b>points essentiels</b> proviennent des avis laissés sur %s au cours des 80 derniers jours que nous estimons fiables.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">En savoir plus sur %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">la façon dont %s par Mozilla détermine la qualité d’un avis</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Paramètres</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Afficher des publicités dans le vérificateur d’avis</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Vous verrez à l’occasion des publicités pour des produits pertinents. Ces produits doivent disposer d’avis qui répondent à nos critères de qualité. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Vous verrez à l’occasion des publicités pour des produits pertinents.  Nous  faisons uniquement la promotion de produits dont les avis sont fiables. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">En savoir plus</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
     <string name="review_quality_check_settings_turn_off">Désactiver le vérificateur d’avis</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Produits alternatifs</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Publicité de %s</string>
     <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
-    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources">Le vérificateur d’avis fonctionne grâce à %s.</string>
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Le vérificateur d’avis fonctionne grâce à %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Le vérificateur d’avis fonctionne grâce à %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s par Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Nouvelles informations à évaluer</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Vérifier maintenant</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Pas encore assez d’avis</string>
+    <string name="review_quality_check_no_reviews_warning_title">Pas encore assez d’avis</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Quand ce produit aura reçu suffisamment d’avis, leur qualité pourra être évaluée.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Le produit n’est pas disponible</string>
 
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si vous constatez le retour de ce produit en stock, signalez-le et nous travaillerons à évaluer les avis.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Signaler que ce produit est de retour en stock</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Signaler que ce produit est de retour en stock</string>
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Signaler que le produit est en stock</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Évaluation de la qualité des avis</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Évaluation de la qualité des avis</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">L’opération peut prendre environ 60 secondes.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Merci de nous l’avoir signalé !</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Nous devrions avoir des informations au sujet des avis sur ce produit d’ici 24 heures. Revenez plus tard.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Nous ne pouvons pas vérifier ces avis</string>
+    <string name="review_quality_check_not_analyzable_info_title">Nous ne pouvons pas vérifier ces avis</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Malheureusement, nous ne pouvons pas vérifier la qualité des avis pour certains types de produits. Par exemple, les cartes cadeaux, le streaming vidéo, la musique et les jeux.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Plus d’informations prochainement</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Nous devrions avoir des informations au sujet des avis sur ce produit d’ici 24 heures. Revenez plus tard.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">L’analyse est à jour</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">J’ai compris</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Aucune information disponible actuellement</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Nous travaillons à résoudre ce problème. Veuillez réessayer ultérieurement.</string>
+    <string name="review_quality_check_generic_error_body">Nous travaillons à résoudre ce problème. Veuillez réessayer ultérieurement.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Aucune connexion réseau</string>
+    <string name="review_quality_check_no_connection_title">Aucune connexion réseau</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Vérifiez votre connexion réseau puis essayez d’actualiser la page.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Aucune information sur ces avis pour le moment</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Pour savoir si les avis sur ce produit sont dignes de confiance, vérifiez leur qualité. Cela ne prend que 60 secondes.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Évaluer la qualité des avis</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Essayez notre guide de confiance pour les avis de produits</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Regardez quelle fiabilité accorder aux avis de produits sur %1$s avant d’acheter. Le vérificateur d’avis, une fonctionnalité expérimentale de %2$s, est intégré au navigateur. Il fonctionne aussi pour %3$s et %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">En utilisant la puissance de %1$s par Mozilla, nous vous aidons à éviter les avis partiaux et mensongers. Notre modèle d’intelligence artificielle s’améliore en permanence pour vous protéger pendant vos achats. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">En savoir plus</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">En sélectionnant « Oui, l’essayer », vous acceptez la %2$s et les %3$s de %1$s par Mozilla.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">politique de confidentialité</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">conditions d’utilisation</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Oui, l’essayer</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Pas maintenant</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Vérifiez si vous pouvez vous fier aux avis sur ce produit, avant l’achat.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Essayer le vérificateur d’avis</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Ces avis sont-ils fiables ? Vérifiez-le maintenant pour voir une évaluation corrigée.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Ouvrir le vérificateur d’avis</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Bêta</string>
+    <string name="review_quality_check_beta_flag">Bêta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Ouvrir le vérificateur d’avis</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Fermer le vérificateur d’avis</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s étoiles sur 5</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">Moins de détails</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
diff --git a/app/src/main/res/values-fur/strings.xml b/app/src/main/res/values-fur/strings.xml
index f9f08772d..8d9e57f41 100644
--- a/app/src/main/res/values-fur/strings.xml
+++ b/app/src/main/res/values-fur/strings.xml
@@ -73,7 +73,7 @@
         private mode in our new Total Private Browsing mode.
         The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
         The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
-    <string name="felt_privacy_info_card_subtitle">%1$s elimine i cookies, la cronologjie e i dâts dai sîts web cuant che tu sieris ducj i barcons privâts. %2$s</string>
+    <string name="felt_privacy_info_card_subtitle">%1$s al elimine i cookies, la cronologjie e i dâts dai sîts cuant che tu sieris ducj i barcons privâts. %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.-->
@@ -320,16 +320,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">No cumò</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Rint %s il to navigadôr di riferiment</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Rint Firefox il to navigadôr di riferiment</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s al met lis personis denant dai profits e al difint la tô riservatece blocant lis spiis inter-sît.\n\nPlui informazions sul nestri %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox al met lis personis denant dai profits e al difint la tô riservatece blocant lis spiis inter-sît.\n\nPlui informazions su la nestre informative su la riservatece.</string>
@@ -349,15 +342,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Jentre</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">No cumò</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Lis notifichis ti judin a jessi plui produtîf cun %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Lis notifichis ti judin a jessi plui produtîf cun Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Mande lis schedis tra dispositîfs, gjestìs i discjariaments e oten sugjeriments su cemût otignî il massim di %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Mande lis schedis tra dispositîfs, gjestìs i files discjamâts e oten sugjeriments su cemût tirâ fûr il massim di Firefox.</string>
@@ -514,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Acessibilitât</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidôr personalizât pal account Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidôr personalizât pal account Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidôr di account Mozilla personalizât </string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidôr personalizât par Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Serivdôr par Firefox Account/Sync modificât. La aplicazion e vignarà sierade par aplicâ lis modifichis…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Serivdôr par Firefox Account/Sync modificât. La aplicazion e vignarà sierade par aplicâ lis modifichis…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Modificât servidôr par account Mozilla e sincronizazion. Daûr a sierâ la aplicazion par aplicâ lis modifichis…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -534,9 +525,11 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Jentre par sincronizâ schedis, segnelibris, passwords e altri.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Account Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Account Firefox</string>
 
 
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Account Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Torne conet par ripiâ la sincronizazion</string>
     <!-- Preference for language -->
@@ -550,7 +543,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Debug di lontan vie USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Visualize motôrs di ricercje</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Visualize motôrs di ricercje</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostre sugjeriments di ricercje</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -569,6 +562,16 @@
     <string name="preferences_account_settings">Impostazions account</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Complete in automatic i URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugjeriments dai sponsors</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">Supuarte %1$s cun sugjeriments sponsorizâts ocasionâi</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">Sugjeriments di %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Oten sugjeriments dal web relatîfs ae tô ricercje</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Vierç i links tes aplicazions</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -670,9 +673,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Il component adizionâl nol è supuartât</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Il component adizionâl nol è supuartât</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Il component adizionâ al è za instalât</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Il component adizionâ al è za instalât</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">I components adizionâi a son disativâts in mût temporani</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Un o plui components adizionâi a àn fermât di funzionâ, rindint instabil il sisteme. %1$s al à cirût di tornâ a inviâ i components adizionâi cence sucès.\n\nDilunc cheste session no si tornarà a inviâ i components adizionâi.\n\nLa rimozion o la disativazion dai components adizionâi e podarès risolvi chest probleme.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Prove a tornâ a inviâ i components adizionâi</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continue cui components adizionâi disativâts</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -688,6 +702,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gjestìs account</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambie la tô password, gjestìs la racuelte dâts o elimine il to account</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronize cumò</string>
     <!-- Preference category for sync -->
@@ -1937,7 +1953,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Zonte</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Salve</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Salve</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modifiche</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2177,7 +2193,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verifiche recensions</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verifiche recensions</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verifiche recensions</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Recensions afidabilis</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2195,6 +2213,162 @@
     <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
     <string name="review_quality_check_explanation_title">Cemût che o determinìn la cualitât des recensions</string>
 
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">O doprìn la tecnologjie IA di %s di Mozilla par verificâ la afidabilitât des recensions sui prodots. Chest ti judarà a valutâ dome la cualitât des recensions, no la cualitât dal prodot.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[O assegnìn aes recensions di ogni prodot un <b>vôt in letaris</b> de A ae F.]]></string>
+
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Recensions afidabilis. O crodìn che lis recensions a rivedin cun buine probabilitât di clients vêrs che a àn lassât recensions onestis e imparziâls.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">O crodìn che lis recensions a sedin afidabilis.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">O crodìn che e sedi une misture di recensions afidabilis e inafidabilis.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Recensions inafidabilis. O crodìn che lis recensions a sedin falsis o che a rivedin di recensôrs di part.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">O crodìn che lis recensions no sedin afidabilis.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>valutazion retificade</b> si base dome su recensions che o crodìn afidabilis.]]></string>
+
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[I elements <b>in evidence</b> a rivin des recensions su %s dai ultins 80 dîs che o ritignìn afidabilis.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Scuvierç altris informazions su %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">cemût che %s di Mozilla al determine la cualitât des recensions</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Impostazions</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Mostre anunzis te verifiche recensions</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Tu viodarâs publicitâts ocasionâls pai prodots pertinents. Ducj i anunzis a scugnin sodifâ i nestris standards di cualitât pes recensions. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Di cuant in cuant tu viodarâs anuncis par prodots pertinents. O promovìn dome prodots cun recensions afidabilis. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Plui informazions</string>
+
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Disative la verifiche recensions</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Altris prodots di valutâ</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Anunzi di %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">La verifiche recensions e à tecnologjie di %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Verifiche recensions cun tecnologjie %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s di Mozilla</string>
+
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Gnovis informazions di controlâ</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Controle cumò</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">No son ancjemò vonde recensions</string>
+
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">A pene che chest prodot al varà plui recensions, o rivarìn a verificâ la lôr cualitât.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Il prodot nol è disponibil</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se tu viodis che chest prodot al è di gnûf disponibil, visinus cuntune segnalazion e nô o lavorarìn par verificâ lis recensions.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Segnale che chest prodot al è di gnûf disponibil</string>
+
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Segnale che il prodot al è disponibil</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Daûr a verificâ la cualitât recensions</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Daûr a verificâ la cualitât recensions</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Cheste operazion e podarès puartâ vie cirche 60 seconts.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Graciis pe segnalazion!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">O varessin di vê informazions su lis recensions di chest prodot dentri di 24 oris. Torne controle plui tart.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Impussibil verificâ chestis recensions</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Magari cussì no, ma nol è pussibil verificâ la cualitât des recensions par cualchi gjenar di prodot, come par esempli lis cjartis regâl, trasmissions video, musiche e zûcs.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informazions disponibilis ca di pôc</string>
+
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">O varessin di vê informazions su lis recensions di chest prodot dentri di 24 oris. Torne controle plui tart.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">La analisi e je inzornade</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Capît</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Nissune informazion disponibile in chest moment</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">O stin lavorant par risolvi il probleme. Torne controle ca di pôc.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Nissune conession di rêt</string>
+
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Controle la conession di rêt e prove a tornâ a cjariâ la pagjine.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">No son ancjemò informazions su chestis recensions</string>
+
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Par savê se lis recensions di chest prodot a son afidabilis, controle la lôr cualitât. Al puarte vie nome un 60 seconts.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Controle cualitât des recensions</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Prove la nestre vuide pes recensions dai prodots</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Scuvierç trop che a son afidabilis lis recensions dai prodots su %1$s prime di comprâju. Verifiche recensions, une funzion sperimentâl di %2$s, e je integrade propite tal navigadôr. E funzione ancje su %3$s e %4$s.</string>
+
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Doprant la tecnologjie di %1$s di Mozilla, ti judìn a evitâ recensions di part e falsis. Il nestri model di inteligjence artificiâl al miore in continuazion par proteziti intant che tu fasis compris. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Plui informazions</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Selezionant “Sì, provilu” tu acetis la %2$s e i %3$s di %1$s di Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">informative su la riservatece</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">tiermins di utilizazion</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Sì, provilu</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">No cumò</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Prime di comprâ, scuvierç se tu ti puedis fidâ des recensions di chest prodot.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prove verifiche recensions</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Sono afidabilis chestis recensions? Controle daurman par viodi la valutazion retificade.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Vierç verifiche recensions</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Vierç verifiche recensions</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Siere verifiche recensions</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s su 5 stelis</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Mostre di mancul</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Mostre di plui</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Cualitât</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Presit</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Spedizion</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Imbaladure e aspiet</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitivitât</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">comprim</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 29de2ee1a..70f12c520 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -325,16 +325,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">No net</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Meitsje %s jo ‘gean nei’-browser</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Meitsje Firefox jo ‘gean nei’-browser</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s pleatst minsken boppe winst en ferdigenet jo privacy troch cross-sitetrackers te blokkearjen.\n\nMear ynfo yn ús %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox pleatst minsken boppe winst en ferdigenet jo privacy troch cross-sitetrackers te blokkearjen.\n\nMear ynfo yn ús privacyferklearing.</string>
@@ -353,15 +346,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Oanmelde</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">No net</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Meldingen helpe jo mear te dwaan mei %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Meldingen helpe jo mear te dwaan mei Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Ferstjoer ljepblêden tusken apparaten, behear downloads en ûntfang tips om %s optimaal te benutten.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Ferstjoer ljepblêden tusken apparaten, behear downloads en ûntfang tips om Firefox optimaal te brûken.</string>
@@ -515,11 +502,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Tagonklikheid</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Oanpaste Firefox Accountserver</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Oanpaste Firefox Accountserver</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Oanpaste Mozilla-accountserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Oanpaste Syncserver</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox Account-/Syncserver oanpast. Tapassing wurdt ôfsluten om wizigingen ta te passen…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account-/Syncserver oanpast. Tapassing wurdt ôfsluten om wizigingen ta te passen…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-account-/Syngronisaasjeserver oanpast. Tapassing wurdt ôfsluten om wizigingen ta te passen…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -535,7 +526,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Meld jo oan om jo ljepblêden, blêdwizers, wachtwurden en mear te syngronisearjen.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-account</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-account</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-account</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ferbyn opnij om de syngronisaasje te ferfetsjen</string>
     <!-- Preference for language -->
@@ -547,7 +540,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging fia USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Sykmasinen toane</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Sykmasinen toane</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Syksuggesjes toane</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -567,6 +560,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">URL’s automatysk oanfolje</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestjes fan sponsors</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">Stypje %1$s mei sa no en dan sponsore suggestjes</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">Suggestjes fan %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Krij suggestjes fan it web relatearre oan jo sykopdracht</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Keppelingen iepenje yn apps</string>
 
@@ -667,9 +670,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Add-on wurdt net stipe</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Add-on wurdt net stipe</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Add-on is al ynstallearre</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Add-on is al ynstallearre</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Add-ons binne tydlik útskeakele</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Ien of mear add-ons wurkje net mear, wêrtroch jo systeem ynstabyl wurdt. It is %1$s net slagge om de add-on(s) opnij te starten.\n\nAdd-ons sille net opnij starte wurden wylst jo aktuele sesje.\n\nIt fuortsmiten of útskeakeljen fan add-ons kin dit probleem oplosse.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Probearje add-ons opnij te starten</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Trochgean mei útskeakele add-ons</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -684,6 +697,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Account beheare</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Wizigje jo wachtwurd, behear gegevenssamling, of wiskje jo account</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">No syngronisearje</string>
     <!-- Preference category for sync -->
@@ -1933,7 +1948,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Tafoegje</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Bewarje</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Bewarje</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Bewurkje</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2184,7 +2199,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Beoardielingskontrôle</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Beoardielingskontrôle</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Beoardielingskontrôle</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Betroubere beoardielingen</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2205,17 +2222,21 @@
     <string name="review_quality_check_explanation_body_reliability">Wy brûke AI-technology fan %s troch Mozilla om de betrouberens fan produktbeoardielingen te analysearjen.
 Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen, net de produktkwaliteit.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Wy jouwe oan de beoardielingen fan elk produkt in <b>letterwearde</b> fan A oant F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Wy jouwe oan de beoardielingen fan elk produkt in <b>letterwearde</b> fan A oant F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Betroubere beoardielingen. Wy leauwe dat de beoardielingen wierskynlik ôfkomstich binne fan echte klanten dy’t earlike, ûnpartidige beoardielingen efterlitten hawwe.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wy tinke dat de beoardielingen betrouber binne.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Wy leauwe dat der in miks is fan betroubere en ûnbetroubere beoardielingen.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Unbetroubere beoardielingen. Wy leauwe dat de beoardielingen wierskynlik nep binne of fan befoaroardiele beoardielers.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wy tinke dat de beoardielingen net betrouber binne.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[De <b>oanpaste wurdearring</b> is allinnich basearre op beoardielingen wêrfan wy tinke dat se betrouber binne.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Hichtepunten</b> binne ôfkomstich fan beoardielingen fan %s yn de ôfrûne 80 dagen dy’t neffens ús betrouber binne.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hichtepunten</b> binne ôfkomstich fan beoardielingen fan %s yn de ôfrûne 80 dagen dy’t neffens ús betrouber binne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Mear ynfo oer %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2225,7 +2246,9 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Advertinsjes toane yn beoardielingskontrôle</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Jo sjogge sa no en dan advertinsjes foar relevante produkten. Alle advertinsjes moatte foldwaan oan ús kwaliteitsnoarmen foar beoardielingen. %s </string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Jo sjogge sa no en dan advertinsjes foar relevante produkten. Alle advertinsjes moatte foldwaan oan ús kwaliteitsnoarmen foar beoardielingen. %s </string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Jo sjogge sa no en dan advertinsjes foar relevante produkten. Wy advertearje allinnich foar produkten mei betroubere beoardielingen. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Mear ynfo</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2235,7 +2258,9 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Advertinsje fan %s</string>
     <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
-    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources">Beoardielingskontrôle wurdt mooglik makke troch %s.</string>
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Beoardielingskontrôle wurdt mooglik makke troch %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Beoardielingskontrôle is mooglik makke troch %s</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s troch Mozilla</string>
 
@@ -2244,29 +2269,31 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">No kontrolearje</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Noch net genôch beoardielingen</string>
+    <string name="review_quality_check_no_reviews_warning_title">Noch net genôch beoardielingen</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">As dit produkt mear beoardielingen hat, kinne wy harren kwaliteit beoardiele.</string>
+    <string name="review_quality_check_no_reviews_warning_body">As dit produkt mear beoardielingen hat, kinne wy harren kwaliteit beoardiele.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt is net beskikber</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">As jo sjogge dat dit produkt wer op foarried is, meld it dan oan ús en wy sille wurkje om de beoardielingen te kontrolearjen.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Melde dat dit produkt wer op foarried is</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Melde dat dit produkt wer op foarried is</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Rapportearje dat produkt op foarried is</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Beoardielingskwaliteit kontrolearje</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Beoardielingskwaliteit kontrolearje</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Beoardielingskwaliteit kontrolearje</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Beoardielingskwaliteit kontrolearje</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Dit kin ûngefear 60 sekonden duorje.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Dit kin ûngefear 60 sekonden duorje.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Tank foar it melden!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Wy soene binnen 24 oeren ynfo oer de beoardieling fan dit produkt hawwe moatte. Kom letter noch ris werom.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Wy kinne dizze beoardieling net kontrolearje</string>
+    <string name="review_quality_check_not_analyzable_info_title">Wy kinne dizze beoardieling net kontrolearje</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Spitigernôch kinne wy de beoardielingskwaliteit net kontrolearje foar bepaalde soarten produkten. Bygelyks kadokaarten en streaming fideo, muzyk en spultsjes.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Spitigernôch kinne wy de beoardielingskwaliteit net kontrolearje foar bepaalde soarten produkten. Bygelyks kadokaarten en streaming fideo, muzyk en spultsjes.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Ynkoarten mear</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2276,19 +2303,19 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Begrepen</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Der is op dit stuit gjin ynfo beskikber</string>
+    <string name="review_quality_check_generic_error_title">Der is op dit stuit gjin ynfo beskikber</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Wy wurkje deroan om it probleem op te lossen. Kom ynkoarten gau werom.</string>
+    <string name="review_quality_check_generic_error_body">Wy wurkje deroan om it probleem op te lossen. Kom ynkoarten gau werom.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Gjin netwurkferbining</string>
+    <string name="review_quality_check_no_connection_title">Gjin netwurkferbining</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Kontrolearje jo netwurkferbining en probearje dan de side opnij te laden.</string>
+    <string name="review_quality_check_no_connection_body">Kontrolearje jo netwurkferbining en probearje dan de side opnij te laden.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Noch gjin ynfo oer dizze beoardielingen</string>
+    <string name="review_quality_check_no_analysis_title">Noch gjin ynfo oer dizze beoardielingen</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Kontrolearje de beoardielingskwaliteit om te ûntdekken oft de beoardielingen fan dit produkt betrouber binne. It duorret mar ûngefear 60 sekonden.</string>
+    <string name="review_quality_check_no_analysis_body">Kontrolearje de beoardielingskwaliteit om te ûntdekken oft de beoardielingen fan dit produkt betrouber binne. It duorret mar ûngefear 60 sekonden.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Beoardielingskwaliteit kontrolearje</string>
+    <string name="review_quality_check_no_analysis_link">Beoardielingskwaliteit kontrolearje</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Probearje ús fertroude gids foar produktbeoardielingen</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2317,11 +2344,11 @@ Dizze analyze sil jo allinnich helpe om de beoardielingskwaliteit te beoardielen
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Beoardielingskontrôle iepenje</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Beoardielingskwaliteitskontrôle iepenje</string>
+    <string name="review_quality_check_open_handle_content_description">Beoardielingskontrôle iepenje</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Beoardielingskwaliteitskontrôle slute</string>
+    <string name="review_quality_check_close_handle_content_description">Beoardielingskontrôle slute</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s fan 5 stjerren</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 47c452d54..b5cba099a 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -65,6 +65,19 @@
        Mitos frecuentes sobre a navegación privada
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Non deixe rastro neste dispositivo</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">%1$s elimina as súas cookies, o historial e os datos do sitio cando peche todas as súas fiestras privadas. %2$s</string>
+    <!-- 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">Quen podería ver a miña actividade?</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">Inicie a súa próxima lapela privada cun só toque.</string>
@@ -87,6 +100,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Aprenda sobre a protección total de cookies</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">Toque aquí para comezar unha nova sesión privada. Elimine o seu historial, cookies — todo.</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">Necesítase acceso á cámara. Vai á configuración de Android, toque nos permisos e toque en permitir.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -220,6 +238,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Páxina de inicio</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">Borrar o historial de navegación</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
@@ -343,6 +364,19 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Agora non</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Probar o widget de busca de Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Con Firefox na súa pantalla de inicio, terá fácil acceso ao navegador que prioriza a privacidade e bloquea os rastrexadores entre sitios.</string>
+
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Engadir o widget de Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Agora non</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">Abrir unha nova lapela en %1$s</string>
@@ -372,6 +406,8 @@
     <string name="preferences_default_search_engine">Motor de busca predeterminado</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">Buscas</string>
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">Motores de busca</string>
     <!-- Preference for settings related to Search address bar -->
     <string name="preferences_search_address_bar">Barra de enderezos</string>
     <!-- Preference link to rating Fenix on the Play Store -->
@@ -416,8 +452,6 @@
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
     <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">Cancelar</string>
 
-    <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
-    <string name="cookie_banner_handling_details_site_is_not_supported_request_support_button" moz:RemovedIn="115" tools:ignore="UnusedResources">Pedir soporte</string>
     <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
     <string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2">Enviar solicitude</string>
     <!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -602,12 +636,18 @@
     <!-- Text for classic wallpapers title. The first parameter is the Firefox name. -->
     <string name="wallpaper_classic_title">%s clásico</string>
     <!-- Text for limited edition wallpapers title. -->
-    <string name="wallpaper_limited_edition_title">Edición limitada</string>
+    <string name="wallpaper_limited_edition_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Edición limitada</string>
+    <!-- Text for artist series wallpapers title. "Artist series" represents a collection of artist collaborated wallpapers. -->
+    <string name="wallpaper_artist_series_title">Serie de artistas</string>
     <!-- Description text for the limited edition wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more-->
-    <string name="wallpaper_limited_edition_description_with_learn_more">A nova colección Voces Independentes. %s</string>
+    <string name="wallpaper_limited_edition_description_with_learn_more" moz:RemovedIn="118" tools:ignore="UnusedResources">A nova colección Voces Independentes. %s</string>
 
+    <!-- Description text for the artist series wallpapers with learn more link. The first parameter is the learn more string defined in wallpaper_learn_more. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description_with_learn_more">A colección Voces Independentes. %s</string>
     <!-- Description text for the limited edition wallpapers. -->
-    <string name="wallpaper_limited_edition_description">A nova colección Voces Independentes.</string>
+    <string name="wallpaper_limited_edition_description" moz:RemovedIn="118" tools:ignore="UnusedResources">A nova colección Voces Independentes.</string>
+    <!-- Description text for the artist series wallpapers. "Independent voices" is the name of the wallpaper collection -->
+    <string name="wallpaper_artist_series_description">A colección Voces Independentes.</string>
     <!-- Wallpaper onboarding dialog header text. -->
     <string name="wallpapers_onboarding_dialog_title_text">Probar un toque de cor</string>
     <!-- Wallpaper onboarding dialog body text. -->
@@ -621,6 +661,16 @@
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
     <string name="addon_already_installed">O complemento xa está instalado</string>
 
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Os complementos están desactivados temporalmente</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Un ou máis complementos deixaron de funcionar, facendo que o teu sistema sexa inestable. %1$s tentou reiniciar os complementos sen éxito.\n\nOs complementos non se reiniciarán durante a sesión actual.\n\nA eliminación ou a desactivación de complementos pode solucionar este problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Proba a reiniciar os complementos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar cos complementos desactivados</string>
+
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Xestionar conta</string>
@@ -1187,10 +1237,14 @@
     <string name="share_button_content_description">Compartir</string>
     <!-- Text for the Save to PDF feature in the share menu -->
     <string name="share_save_to_pdf">Gardar como PDF</string>
-    <!-- Text for error message when generating a PDF file Text for error message when generating a PDF file. -->
+    <!-- Text for error message when generating a PDF file Text. -->
     <string name="unable_to_save_to_pdf_error">Non se puido xerar o PDF</string>
+    <!-- Text for standard error snackbar dismiss button. -->
+    <string name="standard_snackbar_error_dismiss">Rexeitar</string>
+    <!-- Text for error message when printing a page and it fails. -->
+    <string name="unable_to_print_error" moz:removedIn="121" tools:ignore="UnusedResources">Non se puido imprimir</string>
     <!-- Text for error message when printing a page and it fails. -->
-    <string name="unable_to_print_error">Non se puido imprimir</string>
+    <string name="unable_to_print_page_error">Non se pode imprimir esta páxina</string>
     <!-- Text for the print feature in the share and browser menu -->
     <string name="menu_print">Imprimir</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
@@ -1285,6 +1339,8 @@
     <string name="snackbar_private_tab_closed">Lapela privada pechada</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Lapelas privadas pechadas</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Elimináronse os datos de navegación privada</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">DESFACER</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1333,12 +1389,16 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">%d lapelas</string>
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title">Historial de navegación e datos dos sitios</string>
+    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118" tools:ignore="UnusedResources">Historial de navegación e datos dos sitios</string>
+    <!-- Title for the history item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">Historial de navegación</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d enderezos</string>
     <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies">Cookies</string>
+    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118" tools:ignore="UnusedResources">Cookies</string>
+    <!-- Title for the cookies and site data items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_and_site_data">Cookies e datos do sitio</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">Pechará a sesión na maioría dos sitios</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -1396,62 +1456,62 @@
 
     <!-- Onboarding -->
     <!-- Text for onboarding welcome header. -->
-    <string name="onboarding_header_2">Benvido a unha internet mellor</string>
+    <string name="onboarding_header_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Benvido a unha internet mellor</string>
     <!-- Text for the onboarding welcome message. -->
-    <string name="onboarding_message">Un navegador creado para as persoas, non para os beneficios.</string>
+    <string name="onboarding_message" moz:RemovedIn="118" tools:ignore="UnusedResources">Un navegador creado para as persoas, non para os beneficios.</string>
     <!-- Text for the Firefox account onboarding sign in card header. -->
-    <string name="onboarding_account_sign_in_header">Continúe onde o deixou</string>
+    <string name="onboarding_account_sign_in_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Continúe onde o deixou</string>
     <!-- Text for the button to learn more about signing in to your Firefox account. -->
-    <string name="onboarding_manual_sign_in_description">Sincronice lapelas e contrasinais entre os dispositivos para cambiar de pantalla sen problemas.</string>
+    <string name="onboarding_manual_sign_in_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Sincronice lapelas e contrasinais entre os dispositivos para cambiar de pantalla sen problemas.</string>
     <!-- Text for the button to manually sign into Firefox account. -->
-    <string name="onboarding_firefox_account_sign_in">Acceder</string>
+    <string name="onboarding_firefox_account_sign_in" moz:RemovedIn="118" tools:ignore="UnusedResources">Acceder</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">A sincronización está activada</string>
 
     <!-- Text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header">Protección de privacidade por defecto</string>
+    <string name="onboarding_tracking_protection_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Protección de privacidade por defecto</string>
     <!-- Text for the tracking protection card description. The first parameter is the name of the application.-->
-    <string name="onboarding_tracking_protection_description_old">%1$s impide automaticamente que as empresas sigan a súa presenza en segredo pola rede.</string>
+    <string name="onboarding_tracking_protection_description_old" moz:RemovedIn="118" tools:ignore="UnusedResources">%1$s impide automaticamente que as empresas sigan a súa presenza en segredo pola rede.</string>
     <!-- Text for the tracking protection card description. -->
-    <string name="onboarding_tracking_protection_description">Protección Total de Cookies impide que os rastrexadores empreguen cookies para asexalo polos sitios.</string>
+    <string name="onboarding_tracking_protection_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Protección Total de Cookies impide que os rastrexadores empreguen cookies para asexalo polos sitios.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button_2">Estándar (predeterminado)</string>
+    <string name="onboarding_tracking_protection_standard_button_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Estándar (predeterminado)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description_3">Equilibrado para privacidade e rendemento. As páxinas cargan con normalidade.</string>
+    <string name="onboarding_tracking_protection_standard_button_description_3" moz:RemovedIn="118" tools:ignore="UnusedResources">Equilibrado para privacidade e rendemento. As páxinas cargan con normalidade.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_option">Estrito</string>
+    <string name="onboarding_tracking_protection_strict_option" moz:RemovedIn="118" tools:ignore="UnusedResources">Estrito</string>
 
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description_3">Bloquea máis rastreadores para que as páxinas carguen máis rápido, pero pode romper algunhas funcionalidades de páxinas.</string>
+    <string name="onboarding_tracking_protection_strict_button_description_3" moz:RemovedIn="118" tools:ignore="UnusedResources">Bloquea máis rastreadores para que as páxinas carguen máis rápido, pero pode romper algunhas funcionalidades de páxinas.</string>
     <!-- text for the toolbar position card header  -->
-    <string name="onboarding_toolbar_placement_header_1">Decida onte colocar a barra de ferramentas</string>
+    <string name="onboarding_toolbar_placement_header_1" moz:RemovedIn="118" tools:ignore="UnusedResources">Decida onte colocar a barra de ferramentas</string>
     <!-- Text for the toolbar position card description -->
-    <string name="onboarding_toolbar_placement_description">Mantéñao na parte inferior ou móvao cara arriba.</string>
+    <string name="onboarding_toolbar_placement_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Mantéñao na parte inferior ou móvao cara arriba.</string>
     <!-- Text for the privacy notice onboarding card header -->
-    <string name="onboarding_privacy_notice_header_1">Vostede controla os seus datos</string>
+    <string name="onboarding_privacy_notice_header_1" moz:RemovedIn="118" tools:ignore="UnusedResources">Vostede controla os seus datos</string>
     <!-- Text for the privacy notice onboarding card description. -->
-    <string name="onboarding_privacy_notice_description">Firefox dálle o control sobre o que comparte en liña e o que comparte con nós.</string>
+    <string name="onboarding_privacy_notice_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Firefox dálle o control sobre o que comparte en liña e o que comparte con nós.</string>
     <!-- Text for the button to read the privacy notice -->
-    <string name="onboarding_privacy_notice_read_button">Lea a nosa política de privacidade</string>
+    <string name="onboarding_privacy_notice_read_button" moz:RemovedIn="118" tools:ignore="UnusedResources">Lea a nosa política de privacidade</string>
 
     <!-- Text for the conclusion onboarding message -->
-    <string name="onboarding_conclusion_header">Listo para abrir unha Internet incrible?</string>
+    <string name="onboarding_conclusion_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Listo para abrir unha Internet incrible?</string>
     <!-- text for the button to finish onboarding -->
-    <string name="onboarding_finish">Iniciar a navegación</string>
+    <string name="onboarding_finish" moz:RemovedIn="118" tools:ignore="UnusedResources">Iniciar a navegación</string>
 
     <!-- Onboarding theme -->
     <!-- text for the theme picker onboarding card header -->
-    <string name="onboarding_theme_picker_header">Escolla o seu tema</string>
+    <string name="onboarding_theme_picker_header" moz:RemovedIn="118" tools:ignore="UnusedResources">Escolla o seu tema</string>
     <!-- text for the theme picker onboarding card description -->
-    <string name="onboarding_theme_picker_description_2">Aforre a batería e a vista co modo escuro.</string>
+    <string name="onboarding_theme_picker_description_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Aforre a batería e a vista co modo escuro.</string>
     <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title">Automático</string>
+    <string name="onboarding_theme_automatic_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Automático</string>
     <!-- Summary of automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_summary">Adáptase á configuración do dispositivo</string>
+    <string name="onboarding_theme_automatic_summary" moz:RemovedIn="118" tools:ignore="UnusedResources">Adáptase á configuración do dispositivo</string>
     <!-- Theme setting for dark mode -->
-    <string name="onboarding_theme_dark_title">Tema escuro</string>
+    <string name="onboarding_theme_dark_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Tema escuro</string>
     <!-- Theme setting for light mode -->
-    <string name="onboarding_theme_light_title">Tema claro</string>
+    <string name="onboarding_theme_light_title" moz:RemovedIn="118" tools:ignore="UnusedResources">Tema claro</string>
 
     <!-- Text shown in snackbar when multiple tabs have been sent to device -->
     <string name="sync_sent_tabs_snackbar">Lapelas enviadas!</string>
@@ -1883,6 +1943,14 @@
     <!-- Accessibility description for the form in which details about the custom search engine are entered -->
     <string name="search_add_custom_engine_form_description">Detalles do motor de busca personalizado</string>
 
+    <!-- Label for the TextField in which user enters custom search engine suggestion URL -->
+    <string name="search_add_custom_engine_suggest_url_label">API de suxestións de busca (opcional)</string>
+    <!-- Placeholder text shown in the Search Suggestion String TextField before a user enters text -->
+    <string name="search_add_custom_engine_suggest_string_hint">URL da API de suxestións de busca</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example" formatted="false" moz:RemovedIn="118" tools:ignore="UnusedResources">Substituí a consulta por «%s». Exemplo:\nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">Substituír a consulta por «%s». Exemplo:\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">Gardar</string>
 
@@ -2092,6 +2160,164 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ir á configuración</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Verificador de recensións</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Recensións fiables</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mestura de recensións fiables e pouco fiables</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Recensións pouco fiables</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Como de fiables son estas recensións?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Calificación axustada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Elimináronse as recensións pouco fiables</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Destacados das recensións recentes</string>
+
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Como determinamos a calidade da revisión</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Usamos a tecnoloxía de IA de %s de Mozilla para comprobar a fiabilidade das recensións de produtos. Isto só che axudará a avaliar a calidade das recensións, non a calidade do produto.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Asignamos ás recensións de cada produto unha <b>nota</b> de A a F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Recensións fiables. Cremos que as recensións son probablemente de clientes reais que deixaron recensións honestas e imparciais.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Cremos que hai unha mestura de recensións fiables e pouco fiables.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Recensións pouco fiables. Cremos que as recensións probablemente sexan falsas ou de revisores tendenciosos.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>valoración axustada</b> baséase só nas recensións que consideramos fiables.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Os <b>destacados</b> son de %s recensións dos últimos 80 días que consideramos fiables.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Máis información sobre %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">como %s de Mozilla determina a calidade da recensión</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Configuración</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Mostrar anuncios no verificador de recensións</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verás anuncios ocasionais de produtos relevantes. Todos os anuncios deben cumprir os nosos estándares de calidade de recensións. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Máis información</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Desactivar o verificador de recensións</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Máis a considerar</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Anuncio de %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">O comprobador de recensións está impulsado por %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">O comprobador de recensións está impulsado por %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s de Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Nova información para comprobar</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Comprobar agora</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Aínda non hai suficientes recensións</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Cando este produto teña máis recensións, poderemos comprobar a súa calidade.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">O produto non está dispoñible</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se ves que este produto está de novo en stock, infórmao e traballaremos en comprobar as recensións.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este produto está de novo en stock</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Comprobando a calidade da recensión</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Comprobando a calidade da recensión</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Isto pode levar uns 60 segundos.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Grazas por informar!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Deberíamos ter información sobre as recensións deste produto nun prazo de 24 horas. Volve a comprobalo máis tarde.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Non podemos comprobar estas recensións</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Desafortunadamente, non podemos comprobar a calidade das recensións de determinados tipos de produtos. Por exemplo, tarxetas de agasallo e streaming de vídeo, música e xogos.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Información dispoñible en breve</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Deberíamos ter información sobre as recensións deste produto nun prazo de 24 horas. Por favor, volve a comprobalo máis tarde.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">A análise está actualizada</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendido</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Non hai información dispoñible neste momento</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Estamos traballando para resolver o problema. Por favor, volve a comprobalo pronto.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Sen conexión de rede</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Comprobe a súa conexión de rede e despois tente cargar de novo a páxina.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Aínda non hai información sobre estas recensións</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Para saber se as recensións deste produto son fiables, comprobe a calidade das recensións. Só leva uns 60 segundos.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Comprobar a calidade da recensión</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Probar a nosa guía de confianza para recensións de produtos</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Consultar a fiabilidade das recensións de produtos en %1$s antes de comprar. A verificación de recensións, unha función experimental de %2$s, está integrada directamente no navegador. Tamén funciona en %3$s e %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Usando o poder de %1$s de Mozilla, axudámoslle a evitar recensións tendenciosas e pouco auténticas. O noso modelo de IA está a mellorar sempre para protexelo mentres compra. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Máis información</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Ao seleccionar «Si, probalo», acepta %2$s e %3$s de %1$s de Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidade</string>
+    <!-- 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">temos de uso</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Si, probalo</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Agora non</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Descubra se pode confiar nas recensións deste produto antes de comprar.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Proba o corrector de recensións</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Son fiables estas recensións? Comprobe agora para ver unha valoración axustada.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir o verificador de recensións</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Abrir o verificador de recensións</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Pechar o verificador de recensións</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrelas</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Amosar menos</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Amosar máis</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Calidade</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Prezo</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Envío</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalaxe e aparencia</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitividade</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">contraer</string>
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index 00e2bec1c..1fa780672 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -105,6 +105,11 @@
     <string name="tcp_cfr_learn_more">Maranduve kookie ñemo’ã guasu rehegua</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">Eikutu ápe eñepyrũ hag̃ua tembiapo ñemigua. Embogue ne rembiasakue, kookie — opavave.</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">Eikotevẽ eike ta’ãngamýime. Eho Android ñembohekópe, eukutu ñemoneĩ ha moneĩ.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -322,16 +327,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ani ko’ág̃a</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Ejapo %s-gui kundahára ehayhuvéva</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Ejapo Firefox-gui kundahára ehayhuvéva</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s omotenonde avápe viru rovake ha omomba’e nde rekoñemi ojokóvo tapykuehoha tenda pa’ũme.\n\nEñemomaranduve %2$s rupive.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox omotenonde avápe viru rovake ha omomba’e nde rekoñemi ojokóvo tapykuehoha tenda pa’ũme.\n\nEñemomaranduve ore ñemurã rupive.</string>
@@ -351,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Eñemboheraguapy</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ani ko’ág̃a</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Marandu’i ne pytyvõta ejapove hag̃ua %s ndive</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Marandu’i ne pytyvõta ejapove hag̃ua Firefox ndive</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Emondo tendayke mba’e’oka pa’ũme, eñangareko ñemboguejýre ha ehecháta ñemoñe’ẽ eiporu porã hag̃ua %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Emondo tendayke mba’e’oka pa’ũme, eñangareko ñemboguejýre ha ehecháta ñemoñe’ẽ eiporu porã hag̃ua Firefox.</string>
@@ -370,7 +362,10 @@
 
     <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Eipuru Firefox widget jehekaha</string>
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Eiporu Firefox widget jehekaha</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Firefox ndive ne mba’erechaha ñepyrũguápe, eikéta pya’e kundahárape omomba’éva tekoñemi ha ojoko umi tenda rapykuehoha.</string>
     <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Embjuaju Firefox widget</string>
@@ -491,7 +486,7 @@
     <string name="reduce_cookie_banner_dialog_change_setting_button">Moneĩ</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
-    <string name="preferences_https_only_summary">Eñeha’ã eike hag̃ua tendakuérape eipurúvo pe taperekoite HTTPS ipapapýva tekorosãverã.</string>
+    <string name="preferences_https_only_summary">Eñeha’ã eike hag̃ua tendakuérape eiporúvo pe taperekoite HTTPS ipapapýva tekorosãverã.</string>
     <!-- Summary of https only preference if https only is set to off -->
     <string name="preferences_https_only_off">Mboguepyre</string>
     <!-- Summary of https only preference if https only is set to on in all tabs -->
@@ -513,11 +508,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Jeikekuaaha</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Mohendahavusu Firefox Account momba’etepyre</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Mohendahavusu Firefox Account momba’etepyre</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Mohendahavusu Mozilla mba’ete mboavapyréva</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Mohendahavusu Sync momba’etepyre</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Account/Sync mba’ete moambuepyre. Esẽnguévo pe tembiporu’ígui emoambue hag̃ua…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Account/Sync mba’ete moambuepyre. Esẽnguévo pe tembiporu’ígui emoambue hag̃ua…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla mba’ete/Sync mohendahavusu moambuepyre. Esẽ tembiporu’ígui iñambue hag̃ua…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Mba’ete</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -533,7 +532,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Eñepyrũ tembiapo embojuehe hag̃ua tendayke, techaukaha, ñe’ẽñemi ha hetave.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox Account</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla mba’ete</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Eikejey eñepyrũjey hag̃ua ñembojuehe</string>
     <!-- Preference for language -->
@@ -564,6 +565,16 @@
     <string name="preferences_account_settings">Mba’ete ñemboheko</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Moĩmbajehegui URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Pytyvõhára ñemoñe’ẽ</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">Eykeko %1$s ñemoñe’ẽ jehepyme’ẽrã sapy’apy’agua</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 ñemoñe’ẽ</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Emog̃uahẽ ñemoñe’ẽ ñandutígui jeheka rehegua</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Embojuruja juajuha tembiporu’ípe</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -628,7 +639,7 @@
 
     <!-- Wallpapers -->
     <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
-    <string name="wallpapers_item_name_content_description">Mba’erechaha rugua mba’epuru: %1$s</string>
+    <string name="wallpapers_item_name_content_description">Mba’erechaha rugua mba’eporu: %1$s</string>
     <!-- Snackbar message for when wallpaper is selected -->
     <string name="wallpaper_updated_snackbar_message">¡Mba’erechaha rugua hekopyahupyréva!</string>
     <!-- Snackbar label for action to view selected wallpaper -->
@@ -668,10 +679,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Pe moĩmbaha ndojokupytýi</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Pe moĩmbaha ndojokupytýi</string>
 
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Pe moĩmbaha oñemohendáma</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Pe moĩmbaha oñemohendáma</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Umi tembiporu’i ojejoko sapy’ami</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Peteĩ térã hetave tembiporu’i ndoikoéima, péicha rupi apopyvusu ndoku’eporãi. %1$s omoñepyrũsejey tembiporu’i ha ndaikatúi.\n\nUmi tembiporu’i ndoku’emo’ãi ko tembiapo aja.\n\nEipe’a térã embotývo umi tembiporu’i ikatu omyatyrõ ko apañuãi.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Emoñepyrũ umi tembiporu’i</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Eku’ejey tembiporu’i jokopyréva ndive</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -686,6 +707,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Mba’ete ñangareko</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Emoambue ñe’ẽñemi, eñangareko mba’ekuaarã ñembyaty térã embogue mba’ete</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Embojuehe ko’ág̃a</string>
     <!-- Preference category for sync -->
@@ -753,7 +776,7 @@
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">Mba’ekuaarã jehepyme’ẽrã</string>
     <!-- Preference description for marketing data collection -->
-    <string name="preferences_marketing_data_description2">Emoherakuã mba’ekuaarã ojepurúva Adjust ndive, ore marketing me’ẽhára</string>
+    <string name="preferences_marketing_data_description2">Emoherakuã mba’ekuaarã ojeporúva Adjust ndive, ore marketing me’ẽhára</string>
     <!-- Title for studies preferences -->
     <string name="preference_experiments_2">Ñembokatupyry</string>
     <!-- Summary for studies preferences -->
@@ -1058,7 +1081,7 @@
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">¿Añetehápepa emboguetese ko marandurenda?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
-    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s omboguéta umi mba’epuru poravopyre.</string>
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s omboguéta umi mba’eporu poravopyre.</string>
     <!-- Text for the cancel button on delete bookmark dialog -->
     <string name="bookmark_delete_negative">Heja</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -1507,7 +1530,7 @@
     <!-- Text for the tracking protection card description. The first parameter is the name of the application.-->
     <string name="onboarding_tracking_protection_description_old" moz:RemovedIn="118" tools:ignore="UnusedResources">%1$s ojoko ijehegui umi atyguasúpe ani ohapykueho ñanduti rupive kañyhápe.</string>
     <!-- Text for the tracking protection card description. -->
-    <string name="onboarding_tracking_protection_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Ñemo’ãmbaite kookie rovake omboyke tapykuehohápe oipurúvo kookie nde rapykueho hag̃ua ñandutípe.</string>
+    <string name="onboarding_tracking_protection_description" moz:RemovedIn="118" tools:ignore="UnusedResources">Ñemo’ãmbaite kookie rovake omboyke tapykuehohápe oiporúvo kookie nde rapykueho hag̃ua ñandutípe.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
     <string name="onboarding_tracking_protection_standard_button_2" moz:RemovedIn="118" tools:ignore="UnusedResources">Ypyguaite (ijypygua)</string>
     <!-- text for standard blocking option button description -->
@@ -1989,7 +2012,7 @@
     <!-- Label for the TextField in which user enters custom search engine URL -->
     <string name="search_add_custom_engine_url_label">Jeheka juajuha URL</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
-    <string name="search_add_custom_engine_search_string_hint">Jehekaha juajuha eipurútava</string>
+    <string name="search_add_custom_engine_search_string_hint">Jehekaha juajuha eiporútava</string>
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL eiporukuaáva eheka hag̃ua</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
@@ -2235,12 +2258,42 @@
     <string name="review_quality_check_grade_d_f_description">Hechajeyha jerovia’ỹva</string>
     <!-- Text for title presenting the reliability of a product's reviews. -->
     <string name="review_quality_check_grade_title">Ejerovia añetépa ko’ã hechajeýre</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Ñeha’ãmby ha’etéva</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description">Oñemboguéta marandu’i jerovia’ỹha</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Mba’e iporãva marandu’i osẽramóvare</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Mba’éichapa jaikuaáta marandu’i iporãha</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Roiporu tembiporupyahu IA %s Mozilla rupive rohesa’ỹijo hag̃ua iporãpa marandu’i apopyregua. Ñehesa’ỹijo oipytyvõta roha’ã hag̃ua marandu’i porãngue, ndaha’éi apopyre porãngue.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Rome’ẽ marandu’i peteĩteĩva apopyrépe <b>papapy tai ndive</b> A guive F peve.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Hechajey jeroviaha. Roguerovia marandu’i ouha joguaharaitégui ohejáva umi marandu’i oñanduháicha ha ñaña’ỹre.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Roikuaa marandu’i ejeroviakuaaha.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Roikuaa oĩha marandu’i jeroviaha ha jerovia’ỹha.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Marandu’i jerovia’iveha. Roikuaa marandu’i ikatuha japu térã ou hechajeyhára iñañávagui.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Roikuaa marandu’íre ejeroviakuaaha.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>ñeha’ã oikóva</b> oma’ẽ marandu’i rohecháva ojegueroviaha añoite.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Umi <b>kyta mba’eguasúva</b> ou marandu’i %s 80 ára ohasaramóvagui ikatuha ejerovia.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Eikuaave ko’ãvare %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">mba’éichapa %s Mozilla mba’e ohechaukáta marandu’i iporãha</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Ñemboheko</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Ehechauka ñemurã marandu’i rechajeyhápe</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Ehecháta ñemurã sapy’agua apopyre iporãvagui. Opaite ñemurã ojapova’erã oipotaháicha jehechajey porãverã. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Eikuaave</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2250,28 +2303,92 @@
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Ñemurã %s</string>
 
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Marandu’i rechajeyhápe oiko %s rupive.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Marandu’i rechajeyhápe oiko %s rupive.</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s Mozilla mba’e</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
     <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Marandu pyahu ehechajey hag̃ua</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Ehechajey ko’ág̃a</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Noĩri gueteri heta marandu’i</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Ko apopyre ojehecha hetajey rire, rohesa’ỹijóta iporãngue.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Apopyre ndojeporukuaái</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Ehechárõ ko apopyre ojejoguakuaajeýma, oremomarandu ha romba’apóta hekopyahu hag̃ua ñehesa’ijo.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Emombe’u ko apopyre ojeporukuaajeymaha</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Ehechajey marandu’i porãngue</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Ehechajey marandu’i porãngue</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Kóva ipukukuaa 60 aravo’ive rupi.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">¡Aguyje emomarandúre!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Oĩva’erã marandu ko apopyre jehechajey rehegua 24 aravo oútavape. Ehechajey uperire.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Ndorohechajeykuaái ko marandu’i.</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Rombyasy, ndorohechajeykuaái marandu’i porãngue peteĩchagua apopyrépe. Techapyrã, jopói kuatia’atã ha ta’ãngamýi ñemyasãi, purahéi ha ñembosarái.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Marandu ojeporupotáma</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Oĩva’erã marandu ko apopyre jehechajey rehegua 24 aravo oútavape. Ehechajey upéi.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Ñehesa’ỹijo hekopyahúma</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Aikumby</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Ndaipóri marandu ko’ág̃aite</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Romba’apo opa hag̃ua apañuãi. Ikatúpiko, eha’ãjey ag̃ave.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Ndaikatúi eike ñandutípe</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Ehechajey nde jeikekatu ñandutípe ha emyanyhẽjey kuatiarogue.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Ndaipóri mba’eve ko’ã marandu’i rehegua</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Eikuaa hag̃ua ko apopyre marandu’i jeroviahápa, ehechajey iporãpa marandu’i. Hi’aréta 60 aravo’ive rupi.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Ehechajey marandu’i porãngue</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Eiporu ore marandu’i jeguataha rechajey jeroviápe</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Eikuaave</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Eiporavóvo “Héẽ, eiporu”, emoneĩ %1$s %2$s-gua ha %3$s Mozilla mba’e.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
-    <string name="review_quality_check_contextual_onboarding_privacy_policy">temiñemi purureko</string>
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">temiñemi porureko</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">temiñemi jeporurã</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
-    <string name="review_quality_check_contextual_onboarding_primary_button_text">Héẽ, eipuru</string>
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Héẽ, eiporu</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ani ko’ág̃a</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Ehecha ejeroviátapa marandu’i ko’ã apopyre reheguáre — ejogua mboyve.</string>
     <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
-    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Eipuru hechajey rechaha</string>
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Eiporu hechajey rechaha</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Ejeroviápa ko’ã jehechajeýre. Eporandu ko’ág̃a ehecha hag̃ua ñeha’ã porãngue.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Embojuruja marandu’i rechajeyha</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Embojuruja marandu’i rechajeyha</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Emboty marandu’i rechajeyha</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s 5 mbyjáva</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">Ehechauka’ive</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
@@ -2285,6 +2402,9 @@
     <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
     <string name="review_quality_check_highlights_type_packaging_appearance">Mbyapeha ha jehecharã</string>
 
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Katupyryrasa</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">pa’ãmba</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index eebbb7a4d..e30b220e0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -65,6 +65,10 @@
     <string name="private_browsing_placeholder_description_2">%1$s čisti tvoju povijest pretraživanja i pregledavanja u privatnim karticama kada ih zatvoriš ili izađeš iz aplikacije. Ovo te ne čini anonimnim prema web-stranicama ili tvom pružatelju internetskih usluga, ali olakšava da zadržiš privatnim ono što radiš na internetu od ostalih osoba koje koriste ovaj uređaj.</string>
     <string name="private_browsing_common_myths">Česti mitovi o privatnom pregledavanju</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ne ostavljaj tragove na ovom uređaju</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">Pokrenite svoju sljedeću privatnu karticu jednim dodirom.</string>
@@ -87,6 +91,7 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Saznajte više o totalnoj zaštiti kolačića</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">Potreban je pristup kameri. Otvori postavke Androida, odaberi dozvole i dopusti pristup kameri.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -298,16 +303,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ne sada</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Učinite %s vašim glavnim pretraživačem</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Učinite Firefox vašim glavnim pretraživačem</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s stavlja ljude iznad profita i brani vašu privatnost blokiranjem alata za praćenje.\n\nSaznajte više u našem %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox stavlja ljude iznad profita i brani vašu privatnost blokiranjem alata za praćenje.\n\nSaznajte više u našoj politici privatnosti.</string>
@@ -326,15 +324,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Prijava</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ne sada</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Obavijesti vam pomažu da učinite više s %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Obavijesti vam pomažu da učinite više s Firefoxom</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Šaljite kartice između uređaja, upravljajte preuzimanjima i primajte savjete kako najbolje iskoristiti %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Šaljite kartice između uređaja, upravljajte preuzimanjima i primajte savjete kako najbolje iskoristiti Firefox.</string>
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index 9941d1c5d..1905a7b54 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -322,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Nic nětko</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Wužiwajće %s po puću</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Wužiwajće Firefox po puću</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ludźi nad dobytki staja a blokuje sydła přesahowace slědowaki, zo by wašu priwatnosć škitał.\n\nDalše informacije w našim %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ludźi nad dobytki staja a blokuje sydła přesahowace slědowaki, zo by wašu priwatnosć škitał.\n\nDalše informacije w našej zdźělence priwatnosće.</string>
@@ -350,15 +343,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Přizjewić</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Nic nětko</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Zdźělenki wam pomhaja, wjace z %s činić</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Zdźělenki wam pomhaja, wjace z Firefox činić</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Sćelće rajtarki mjez gratami, rjadujće sćehnjenja a dóstańće pokiwy, zo byšće najwjace z %s wućahnył.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Sćelće rajtarki mjez gratami, rjadujće sćehnjenja a dóstańće pokiwy, zo byšće najwjace z Firefox wućahnył.</string>
@@ -513,11 +500,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Bjezbarjernosć</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Swójski kontowy serwer Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Swójski kontowy serwer Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Swójski kontowy serwer Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Swójski synchronizowanski serwer</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Kontowy resp. synchronizowanski serwer Firefox je so změnił. Nałoženje so kónči, zo bychu so změny nałožili…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontowy resp. synchronizowanski serwer Firefox je so změnił. Nałoženje so kónči, zo bychu so změny nałožili…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Kontowy resp. synchronizowanski serwer Mozilla je so změnił. Nałoženje so kónči, zo bychu so změny nałožili…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -533,7 +524,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Zregistrujće so, zo byšće rajtarki, zapołožki, hesła a dalše synchronizował.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Konto Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Konto Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Konto Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Zaso zwjazać, zo by ze synchronizaciju pokročowało</string>
     <!-- Preference for language -->
@@ -545,7 +538,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Zdalene pytanje zmylkow přez USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Pytawy pokazać</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Pytawy pokazać</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Pytanske namjety pokazać</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -564,6 +557,16 @@
     <string name="preferences_account_settings">Kontowe nastajenja</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">URL awtomatisce wudospołnić</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Namjety wot sponsorow</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">Podpěrajće %1$s ze składnostnymi sponserowanymi namjetami</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">Namjety wot %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Wobstarajće sej namjety z weba nastupajo waše pytanje</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Wotkazy w nałoženjach wočinić</string>
 
@@ -619,11 +622,11 @@
     <!-- Summary for the customize home screen section with Pocket. The first parameter is product name Pocket -->
     <string name="customize_toggle_pocket_summary">Nastawki spěchowane wot %s</string>
     <!-- Title for the customize home screen section with sponsored Pocket stories. -->
-    <string name="customize_toggle_pocket_sponsored">Sponsorowane stawizny</string>
+    <string name="customize_toggle_pocket_sponsored">Sponserowane stawizny</string>
     <!-- Title for the opening wallpaper settings screen -->
     <string name="customize_wallpapers">Pozadkowe wobrazy</string>
     <!-- Title for the customize home screen section with sponsored shortcuts. -->
-    <string name="customize_toggle_contile">Sponsorowane zwjazanja</string>
+    <string name="customize_toggle_contile">Sponserowane zwjazanja</string>
 
     <!-- Wallpapers -->
     <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
@@ -665,9 +668,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Přidatk so njepodpěruje</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Přidatk so njepodpěruje</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Přidatk je hižo instalowany.</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Přidatk je hižo instalowany.</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Přidatki su nachwilu znjemóžnjene</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Jedyn přidatk abo wjacore přidatki su přestali fungować a destabilizuja waš system. %1$s je njewuspěšnje spytał, přidatki znowa startować.\n\nPřidatki so za waše aktualne posedźenje znowa njestartuja.\n\nHdyž přidatki wotstronjeće abo znjemóžnjeće, budźe so tutón problem snano rozrisać.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Spytajće přidatki znowa startować</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Ze znjemóžnjenymi přidatkami pokročować</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -682,6 +695,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Konto rjadować</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Změńće swoje hesło, rjadujće datowu zběrku abo zhašejće swoje konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Nětko synchronizować</string>
     <!-- Preference category for sync -->
@@ -1943,7 +1958,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Přidać</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Składować</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Składować</string>
 
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Wobdźěłać</string>
@@ -2121,7 +2136,7 @@
     <!-- Text for the menu button to navigate to sponsors and privacy support articles. '&amp;' is replaced with the ampersand symbol: & -->
     <string name="top_sites_menu_sponsor_privacy">Naši sponsorojo a waša priwatnosć</string>
     <!-- Label text displayed for a sponsored top site. -->
-    <string name="top_sites_sponsored_label">Sponsorowany</string>
+    <string name="top_sites_sponsored_label">Sponserowany</string>
 
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
@@ -2184,7 +2199,7 @@
     <string name="pocket_stories_feature_learn_more">Dalše informacije</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">Sponsorowany</string>
+    <string name="pocket_stories_sponsor_indication">Sponserowany</string>
 
     <!-- Snackbar message for enrolling in a Nimbus experiment from the secret settings when Studies preference is Off.-->
     <string name="experiments_snackbar">Zmóžńće telemetriju, zo byšće daty słał.</string>
@@ -2193,7 +2208,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Kontrola pohódnoćenjow</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontrola pohódnoćenjow</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Kontrola pohódnoćenjow</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Spušćomne pohódnoćenja</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2214,17 +2231,21 @@
     <string name="review_quality_check_explanation_body_reliability">Wužiwamy technologiju KI z %s wot Mozilla, zo bychmy spušćomnosć produktowych pohódnoćenjow kontrolowali.
 To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produktow.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Přirjadujemy pohódnoćenjam kóždeho produkta <b>pismikowu znamku</b> wot A do F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Přirjadujemy pohódnoćenjam kóždeho produkta <b>pismikowu znamku</b> wot A do F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Spušćomne pohódnoćenja. Myslimy sej, zo pohódnoćenja su najskerje wot woprawdźitych kupcow, kotřiž su sprawne, bjezpředsudne pohódnoćenja zawostajili.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wěrimy, zo pohódnoćenja su spušćomne.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Wěrimy, zo je měšeńca spušćomnych a njespušćomnych pohódnoćenjow.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Njespušćomne pohódnoćenja. Myslimy sej, zo pohódnoćenja su najskerje sfalšowane abo wot pohódnoćowacych z předsudkami.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wěrimy, zo pohódnoćenja spušćomne njejsu.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Přiměrjene hódnoćenje</b> jenož na pohódnoćenjach bazuje, kotrež mamy za spušćomne.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Wjerški</b> su z pohódnoćenjow %s w běhu poslednich 80 dnjow, kotrež mamy za spušćomne.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Wjerški</b> su z pohódnoćenjow %s w běhu poslednich 80 dnjow, kotrež mamy za spušćomne.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Zhońće wjace wo %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2234,7 +2255,9 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Wabjenje w kontroli pohódnoćenjow pokazać</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Budźeće hdys a hdys wabjenje za relewantne produkty widźeć. Wšě wabjenske anonsy dyrbja našim standardam za kwalitu pohódnoćenjow wotpowědować. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Budźeće hdys a hdys wabjenje za relewantne produkty widźeć. Wšě wabjenske anonsy dyrbja našim standardam za kwalitu pohódnoćenjow wotpowědować. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Budźeće hdys a hdys wabjenje za relewantne produkty widźeć. Wabimy jenož za produkty ze spušćomnymi pohódnoćenjemi. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Dalše informacije</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2254,29 +2277,31 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Nětko kontrolować</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Hišće dosć pohódnoćenjow njeje</string>
+    <string name="review_quality_check_no_reviews_warning_title">Hišće dosć pohódnoćenjow njeje</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Hdyž tutón produkt ma wjace pohódnoćenjow, móžemy jich kwalitu kontrolować.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Hdyž tutón produkt ma wjace pohódnoćenjow, móžemy jich kwalitu kontrolować.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt k dispoziciji njeje</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Jeli widźiće, zo tutón produkt je zaso na składźe, zdźělće to a budźemy na kontrolowanju pohódnoćenjow dźěłać.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Zdźělić, zo tutón produkt je zaso na składźe</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Zdźělić, zo tutón produkt je zaso na składźe</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Zdźělić, zo produkt je na składźe</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrola kwalitu pohódnoćenjow</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontrola kwalitu pohódnoćenjow</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrola kwalitu pohódnoćenjow</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontrola kwalitu pohódnoćenjow</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">To móhło na 60 sekundow trać.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">To móhło na 60 sekundow trać.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Wulki dźak za zdźělenku!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">My dyrbjeli w běhu 24 hodźin informacije wo pohódnoćenjach tutoho produkta měć. Přińdźće prošu nimo.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Njemóžemy tute pohódnoćenja přepruwować</string>
+    <string name="review_quality_check_not_analyzable_info_title">Njemóžemy tute pohódnoćenja přepruwować</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Bohužel njemóžemy kwalitu pohódnoćenja za wěste produktowe typy kontrolować. Na přikład za darne karty a prudźace widejo, hudźbu a hry.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Bohužel njemóžemy kwalitu pohódnoćenja za wěste produktowe typy kontrolować. Na přikład za darne karty a prudźace widejo, hudźbu a hry.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informacije bórze přińdu</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2286,19 +2311,19 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Sym zrozumił</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Tuchwilu informacije k dispoziciji njejsu</string>
+    <string name="review_quality_check_generic_error_title">Tuchwilu informacije k dispoziciji njejsu</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Dźěłamy na rozrisanju tutoho problema. Přińdźće prošu bórze zaso nimo.</string>
+    <string name="review_quality_check_generic_error_body">Dźěłamy na rozrisanju tutoho problema. Přińdźće prošu bórze zaso nimo.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Žadyn syćowy zwisk</string>
+    <string name="review_quality_check_no_connection_title">Žadyn syćowy zwisk</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Přepruwujće swój syćowy zwisk a spytajće potom stronu znowa začitać.</string>
+    <string name="review_quality_check_no_connection_body">Přepruwujće swój syćowy zwisk a spytajće potom stronu znowa začitać.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Hišće žane informacije wo tutych pohódnoćenjach</string>
+    <string name="review_quality_check_no_analysis_title">Hišće žane informacije wo tutych pohódnoćenjach</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Zo byšće zhonił, hač pohódnoćenja tutoho produkta su spušćomne, kontrolujće kwalitu pohódnoćenjow. Traje jenož na 60 sekundow.</string>
+    <string name="review_quality_check_no_analysis_body">Zo byšće zhonił, hač pohódnoćenja tutoho produkta su spušćomne, kontrolujće kwalitu pohódnoćenjow. Traje jenož na 60 sekundow.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Kwalitu pohódnoćenjow kontrolować</string>
+    <string name="review_quality_check_no_analysis_link">Kwalitu pohódnoćenjow kontrolować</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Čitajće naš dowěry hódny přewodnik wo pohódnoćenjach produktow</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2326,11 +2351,11 @@ To budźe jenož pomhać, kwalitu pohódnoćenjow posudźić, nic kwalitu produk
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Kontrolu pohódnoćenjow wočinić</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Kontrolu kwality pohódnoćenjow wočinić</string>
+    <string name="review_quality_check_open_handle_content_description">Kontrolu pohódnoćenjow wočinić</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Kontrolu kwality pohódnoćenjow začinić</string>
+    <string name="review_quality_check_close_handle_content_description">Kontrolu pohódnoćenjow začinić</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s z 5 hwěžkow</string>
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index cd7d8c91c..c1cfb9da9 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -66,6 +66,19 @@
        Gyakori tévhitek a privát böngészésről
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ne hagyjon nyomot ezen az eszközön</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">A %1$s törli a sütiket, előzményeket és oldaladatokat, amikor bezárja az összes privát ablakot. %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">Ki láthatja a tevékenységemet?</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">Indítsa el a következő privát lapot egy koppintással.</string>
@@ -88,6 +101,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">További információk a Teljes sütivédelemről</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">Koppintson ide egy új privát munkamenet indításához. Törli az előzményeket, sütiket – mindent.</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">Kamera-hozzáférés szükséges. Ugorjon az Android beállításokhoz, koppintson az engedélyekre, majd az engedélyezésre.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -226,6 +244,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Kezdőképernyő</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">Böngészési előzmények törlése</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Kiválasztott nyelv</string>
@@ -304,16 +325,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Most nem</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Legyen a %s a szokásos böngészője</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Legyen a Firefox a szokásos böngészője</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">A(z) %1$s az embereket helyezi a profit elé, és a webhelyek közötti nyomkövetők blokkolásával védi az Ön adatait.\n\nTovábbi információk az %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">A Firefox az embereket helyezi a profit elé, és a webhelyek közötti nyomkövetők blokkolásával védi az Ön adatait.\n\nTovábbi információk az adatvédelmi nyilatkozatban találhatók.</string>
@@ -332,15 +346,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Bejelentkezés</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Most nem</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Az értesítések segítségével még többet tehet a %s alkalmazással</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Az értesítések segítségével még többet tehet a Firefoxszal</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Küldjön lapokat az eszközök között, kezelje a letöltéseket, és kapjon tippeket arról, hogyan hozza ki a legtöbbet a %s böngészőből.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Küldjön lapokat az eszközök között, kezelje a letöltéseket, és kapjon tippeket arról, hogyan hozza ki a legtöbbet a Firefoxból.</string>
@@ -349,6 +357,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Most nem</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Próbálja ki a Firefox keresőmodult</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Ha a Firefox a kezdőképernyőn van, akkor könnyen hozzáférhet az adatvédelmet előtérbe helyező böngészőhöz, amely blokkolja a webhelyek közötti követőket.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Firefox modul hozzáadása</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Most nem</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">Új %1$s lap megnyitása</string>
@@ -482,11 +502,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Akadálymentesítés</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Egyéni Firefox-fiókkiszolgáló</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Egyéni Firefox-fiókkiszolgáló</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Egyéni Mozilla-fiókkiszolgáló</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Egyéni Sync kiszolgáló</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">A Firefox-fiók/Sync-kiszolgáló módosítva. Kilépés az alkalmazásból a változások érvényesítéséhez…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">A Firefox-fiók/Sync-kiszolgáló módosítva. Kilépés az alkalmazásból a változások érvényesítéséhez…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">A Mozilla-fiók/Sync-kiszolgáló módosítva. Kilépés az alkalmazásból a változások érvényesítéséhez…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Fiók</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -502,7 +526,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Jelentkezzen be a lapok, könyvjelzők, jelszavak és sok más szinkronizálásához.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-fiók</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-fiók</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-fiók</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Újracsatlakozás a szinkronizálás folytatásához</string>
     <!-- Preference for language -->
@@ -514,7 +540,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Távoli hibakeresés USB-n</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Keresőszolgáltatások megjelenítése</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Keresőszolgáltatások megjelenítése</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Keresési javaslatok</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -534,6 +560,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Automatikus URL-kiegészítés</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Szponzorált javaslatok</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">A %1$s támogatása az alkalmankénti szponzorált javaslatokkal</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">Javaslatok a következőtől: %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Kapjon a kereséséhez kapcsolódó javaslatokat a webről</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Hivatkozások megnyitása alkalmazásokban</string>
 
@@ -636,9 +672,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">A kiegészítő nem támogatott</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">A kiegészítő nem támogatott</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">A kiegészítő már telepítve van.</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">A kiegészítő már telepítve van.</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">A kiegészítők ideiglenesen le vannak tiltva</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Egy vagy több kiegészítő működése leállt, ami instabillá teszi a rendszert. A %1$s sikertelenül próbálta újraindítani a kiegészítőt.\n\nA kiegészítők nem fognak újraindulni a jelenlegi munkamenet alatt.\n\nA kiegészítők eltávolítása vagy letiltása megoldhatja a problémát.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Próbálja meg újraindítani a kiegészítőket</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Folytatás letiltott kiegészítőkkel</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -653,6 +699,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Fiók kezelése</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Változtassa meg a jelszavát, kezelje az adatgyűjtést vagy törölje a fiókját</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Szinkronizálás most</string>
     <!-- Preference category for sync -->
@@ -1330,6 +1378,8 @@
     <string name="snackbar_private_tab_closed">Privát lap bezárva</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Privát lapok bezárva</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">A privát böngészési adatok törölve</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">VISSZAVONÁS</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1913,7 +1963,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Hozzáadás</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Mentés</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Mentés</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Szerkesztés</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2161,6 +2211,178 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ugrás a beállításokhoz</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Értékelés-ellenőrző</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Értékelés-ellenőrző</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Megbízható értékelések</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Megbízható és nem megbízható értékelések keveréke</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Nem megbízható értékelések</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Mennyire megbízhatók ezek az értékelések?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Módosított értékelés</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">A nem megbízható értékelések eltávolítva</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Kiemelések a legutóbbi értékelésekből</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Hogyan határozzuk meg az értékelések minőségét</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">A %s MI technológiáját használjuk a termékértékelések megbízhatóságának elemzéséhez. Ez az elemzés csak az értékelések minőségének felmérésében segít, a termék minőségében nem.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Minden termékértékeléshez egy <b>betűvel megadott osztályzatot</b> rendelünk, A-tól F-ig.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Megbízható értékelések. Úgy gondoljuk, hogy az értékelések valószínűleg valódi vásárlóktól származnak, akik őszinte, elfogulatlan értékelést írtak.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Úgy gondoljuk, hogy az értékelések megbízhatók.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Úgy gondoljuk, hogy vegyesen vannak megbízható és nem megbízható értékelések.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Nem megbízható értékelések. Úgy gondoljuk, hogy az értékelések hamisak vagy elfogult értékelőktől származnak.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Úgy gondoljuk, hogy az értékelések nem megbízhatók.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>módosított értékelés</b> az általunk megbízhatónak gondolt értékelések alapján van számítva.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[A <b>kiemelések</b> a(z) %s értékeléseinek az elmúlt 80 napból származó és megbízhatónak ítélt elemei.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Tudjon meg többet arról, %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">hogy a %s by Mozilla hogyan határozza meg az értékelések minőségét</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Beállítások</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Reklámok megjelenítése az értékelés-ellenőrzőben</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Alkalmanként releváns termékek hirdetéseit fogja látni. Minden reklámnak meg kell felelnie az ellenőrzési minőségi követelményeinknek. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Alkalmanként releváns termékek hirdetéseit fogja látni. Csak megbízható értékeléssel rendelkező termékeket hirdetünk. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">További tudnivalók</string>
+
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Értékelés-ellenőrző kikapcsolása</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">További megfontolandó információk</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Reklám a következőtől: %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Az értékelés-ellenőrzőt a %s biztosítja.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Az értékelés-ellenőrzőt a %s biztosítja</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s by Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Új ellenőrizendő információk</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Ellenőrzés most</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Még nincs elég értékelés</string>
+
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Ha több értékelése lesz a terméknek, akkor fogjuk tudni ellenőrizni a minőségüket.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">A termék nem érhető el</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Ha úgy látja, hogy a termék újra raktáron van, akkor jelentse, és akkor dolgozni fogunk az értékelések ellenőrzésén.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Jelentés, hogy a termék újra raktáron van</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Jelentés, hogy a termék raktáron van</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Értékelési minőség ellenőrzése</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Értékelési minőség ellenőrzése</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Ez körülbelül 60 másodpercig tarthat.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Köszönjük, hogy jelentette!</string>
+
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">24 órán belül lesznek információink a termék értékeléseiről. Nézzen vissza később.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Nem tudjuk ellenőrizni ezeket az értékeléseket</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Sajnos bizonyos terméktípusok esetén nem tudjuk ellenőrizni az értékelés minőségét. Például az ajándékutalványok, videóközvetítések, zenék és játékok esetén.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Az információk hamarosan érkeznek</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">24 órán belül lesznek információink a termék értékeléseiről. Nézzen vissza később.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Az elemzés naprakész</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Megértettem</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Jelenleg nem érhető el információ</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Dolgozunk a probléma megoldásán. Nézzen vissza később.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Nincs hálózati kapcsolat</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Ellenőrizze a hálózati kapcsolatot, majd próbálja meg újratölteni az oldalt.</string>
+
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Ezekről az értékelésekről még nincs információ</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Hogy megtudja, hogy ennek a terméknek az értékelései megbízhatóak-e, ellenőrizze az értékelés minőségét. Körülbelül 60 másodpercet vesz igénybe.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Értékelési minőség ellenőrzése</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Próbálja ki megbízható termékértékelési útmutatónkat</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Vásárlás előtt nézze meg, hogy mennyire megbízhatók a %1$s termékértékelései. Az értékelés-ellenőrző, a %2$s egy kísérleti funkciója, közvetlenül a böngészőbe van építve. A következőkön is működik: %3$s és %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">A %1$s by Mozilla erejét használva segítünk elkerülni az elfogult és a nem hiteles értékeléseket. Az MI modellünket folyamatosan fejlesztjük, hogy megvédjük Önt vásárlás közben. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">További tudnivalók</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Az „Igen, kipróbálom” kiválasztásával elfogadja a következőt: a %1$s by Mozilla %2$s és %3$s.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">adatvédelmi irányelvei</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">felhasználási feltételei</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Igen, kipróbálom</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Most nem</string>
+
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Tudja meg, hogy megbízhat-e ezen termék értékeléseiben – még a vásárlás előtt.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Próbálja ki az értékelés-ellenőrzőt</string>
+
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Megbízhatók ezek az értékelések? Nézze meg a módosított értékelés megtekintéséhez.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Értékelés-ellenőrző megnyitása</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Béta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Értékelés-ellenőrző megnyitása</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Értékelés-ellenőrző bezárása</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s / 5 csillag</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Kevesebb megjelenítése</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Több megjelenítése</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Minőség</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Ár</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Szállítás</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Csomagolás és megjelenés</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Versenyképesség</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">összecsukás</string>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 8f1b66a4f..1e77099c5 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -321,16 +321,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ոչ հիմա</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Դարձրեք %s-ը ձեր հիմնական դիտարկիչը</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Դարձրեք Firefox-ը ձեր հիմնական դիտարկիչը</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s-ը մարդկանց վեր է դասում շահույթից և պաշտպանում է ձեր գաղտնիությունը՝ արգելափակելով միջկայքի հետագծիչները:\n\nԻմացեք ավելին մեր %2$s-ում:</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox-ը մարդկանց վեր է դասում շահույթից և պաշտպանում է ձեր գաղտնիությունը՝ արգելափակելով միջկայքի հետագծիչները:\n\nԻմացեք ավելին մեր գաղտնիության ծանուցումներում:</string>
@@ -349,15 +342,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Մուտք գործել</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ոչ հիմա</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Ծանուցումներն օգնում են ձեզ ավելին անել %s-ի հետ</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Ծանուցումներն օգնում են ձեզ ավելին անել Firefox-ի հետ</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Ուղարկեք ներդիրներ սարքերի միջև, կառավարեք ներբեռնումները և ստացեք խորհուրդներ %s-ից առավելագույնը քաղելու վերաբերյալ:</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Ուղարկեք ներդիրներ սարքերի միջև, կառավարեք ներբեռնումները և ստացեք խորհուրդներ Firefox-ից առավելագույնը քաղելու վերաբերյալ:</string>
@@ -511,11 +498,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Մատչելիություն</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Ընտրովի Firefox հաշվի սերվեր</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Ընտրովի Firefox հաշվի սերվեր</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Mozilla հաշվի հարմարեցված սպասարկիչ</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Ընտրովի համաժամեցման սերվեր</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox հաշիվը / համաժամեցման սերվերը փոփոխված է: Հայտը դադարեցվում է՝ փոփոխությունները գործադրելու համար…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox հաշիվը / համաժամեցման սերվերը փոփոխված է: Հայտը դադարեցվում է՝ փոփոխությունները գործադրելու համար…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla հաշիվը/Համաժամեցման սպասարկիչը փոփոխվել են: Դուրս եկեք հավելվածից՝ փոփոխությունները գորխադրելու համար…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Հաշիվ</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -531,7 +522,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Մուտք գործեք՝ ներդիրները, էջանիշերը, գաղտնաբառերը և ավելին համաժամեցնելու համար:</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-ի հաշիվ</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-ի հաշիվ</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Կրկին կապակցվեք՝ համաժամեցումը վերսկսելու համար</string>
     <!-- Preference for language -->
@@ -544,7 +537,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Հեռակա վրիպազերծում USB-ով</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Ցուցադրել որոնիչները</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Ցուցադրել որոնիչները</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Ցուցադրել որոնման հուշումներ</string>
 
@@ -564,6 +557,16 @@
     <string name="preferences_account_settings">Հաշվի կարգավորումներ</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Ինքնալրացում</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 -->
@@ -663,9 +666,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Հավելումը չի աջակցվում</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Հավելումը չի աջակցվում</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Հավելումն արդեն տեղադրված է</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Հավելումն արդեն տեղադրված է</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Հավելումները ժամանակավորապես անջատված են</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Մեկ կամ մի քանի հավելում դադարել են գործել: %1$s-ն անհաջող փորձեց վերամեկնարկել հավելում(ներ)ը:\n\nՀավելումները չեն վերամեկնարկի ընթացիկ աշխատաշրջանում:\n\nՀավելումների հեռացումը կամ անջատումը կարող է ուղղել այս խնդիրը:</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Փորձեք վերագործարկել հավելումները</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Շարունակեք հավելումներն անջատված</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -680,6 +693,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Կառավարել հաշիվը</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Փոխեք ձեր գաղտնաբառը, կառավարեք տվյալների հավաքագրումը կամ ջնջեք ձեր հաշիվը</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Համաժամեցնել</string>
     <!-- Preference category for sync -->
@@ -1932,7 +1947,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Ավելացնել</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Պահպանել</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Պահպանել</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Խմբագրել</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2181,7 +2196,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Վերանայման ստուգիչ</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Վերանայման ստուգիչ</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Վերանայել ստուգիչը</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Հուսալի կարծիքներ</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2201,18 +2218,22 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Մենք օգտագործում ենք AI տեխնոլոգիա %s-ից Mozilla-ի կողմից՝ արտադրանքի կարծիքների հավաստիությունը ստուգելու համար: Սա միայն կօգնի ձեզ գնահատել կարծիքների որակը, այլ ոչ թե արտադրանքի որակը:</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Մենք յուրաքանչյուր ապրանքի կարծիքներին տալիս ենք <b>տառային գնահատական</b>՝ A-ից մինչև F:]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Մենք յուրաքանչյուր ապրանքի կարծիքներին տալիս ենք <b>տառային գնահատական</b>՝ A-ից մինչև F:]]></string>
 
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Հուսալի կարծիքներ: Մենք կարծում ենք, որ կարծիքները, հավանաբար, իրական հաճախորդներից են, ովքեր թողել են ազնիվ, անաչառ կարծիքներ:</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Մենք կարծում ենք, որ կարծիքներն վստահելի են:</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Մենք հավատում ենք, որ կա հուսալի և անվստահելի կարծիքների խառնուրդ:</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Անվստահելի կարծիքներ: Մենք կարծում ենք, որ կարծիքները, հավանաբար, կեղծ են կամ կողմնակալ գրախոսների կողմից:</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Մենք կարծում ենք, որ կարծիքներն անվստահելի են:</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Ճշգրտված վարկանիշը</b> հիմնված է միայն այն կարծիքների վրա, որոնք մենք վստահելի ենք համարում:]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Գունանշումները</b> վերջին 80 օրվա ընթացքում %s կարծիքներից են, որոնք, մեր կարծիքով, հուսալի են:]]></string>
+    <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. -->
@@ -2222,7 +2243,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Ցուցադրել գովազդը կարծիքների ստուգիչում</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Դուք երբեմն կտեսնեք համապատասխան ապրանքների գովազդներ: Բոլոր գովազդները պետք է համապատասխանեն կարծիքների որակի մեր չափանիշներին: %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Դուք երբեմն կտեսնեք համապատասխան ապրանքների գովազդներ: Բոլոր գովազդները պետք է համապատասխանեն կարծիքների որակի մեր չափանիշներին: %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Դուք երբեմն կտեսնեք համապատասխան ապրանքների գովազդներ: Մենք գովազդում ենք միայն վստահելի կարխիքներով ապրանքներ: %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Իմանալ ավելին</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2232,7 +2255,9 @@
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Գովազդ %s-ի կողմից</string>
     <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
-    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources">Կարծիքների ստուգիչն աշխատում է %s-ի կողմից:</string>
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Կարծիքների ստուգիչն աշխատում է %s-ի կողմից:</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Կարծիքների ստուգիչը ստեղծված է %s-ի կողմից</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s Mozilla-ի կողմից</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2240,29 +2265,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Ստուգիր հիմա</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Դեռևս բավարար ակնարկներ չկան</string>
+    <string name="review_quality_check_no_reviews_warning_title">Դեռևս բավարար ակնարկներ չկան</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Երբ այս ապրանքն ավելի շատ կարծիքներ ունենա, մենք կկարողանանք ստուգել դրանց որակը:</string>
+    <string name="review_quality_check_no_reviews_warning_body">Երբ այս ապրանքն ավելի շատ կարծիքներ ունենա, մենք կկարողանանք ստուգել դրանց որակը:</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Ապրանքը հասանելի չէ</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Եթե տեսնեք, որ այս ապրանքը կրկին պահեստում է, հաղորդեք դրա մասին, և մենք կաշխատենք ստուգել ակնարկները:</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Հաղորդեք, որ այս ապրանքը կրկին պահեստում է</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Հաղորդեք, որ այս ապրանքը կրկին պահեստում է</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Զեկուցված ապրանքը պահեստում է</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Կարծիքի որակի ստուգում</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Կարծիքի որակի ստուգում</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Կարծիքի որակի ստուգում</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Կարծիքի որակի ստուգում</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Սա կարող է տևել մոտ 60 վայրկյան:</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Սա կարող է տևել մոտ 60 վայրկյան:</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Շնորհակալություն հայտնելու համար:</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Մենք պետք է 24 ժամվա ընթացքում տեղեկություններ ունենանք այս ապրանքի կարծիքների մասին: Խնդրում ենք նորից ստուգել:</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Մենք չենք կարող ստուգել այս կարծիքները</string>
+    <string name="review_quality_check_not_analyzable_info_title">Մենք չենք կարող ստուգել այս կարծիքները</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Ցավոք, մենք չենք կարող ստուգել որոշ տեսակի ապրանքների կարծիքների որակը: Օրինակ՝ նվեր քարտեր և հոսքային տեսանյութերի, երաժշտության և խաղեր:</string>
+    <string name="review_quality_check_not_analyzable_info_body">Ցավոք, մենք չենք կարող ստուգել որոշ տեսակի ապրանքների կարծիքների որակը: Օրինակ՝ նվեր քարտեր և հոսքային տեսանյութերի, երաժշտության և խաղեր:</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Տեղեկությունները շուտով</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2272,19 +2299,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Հասկացա</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Այս պահին տեղեկություններ չկան</string>
+    <string name="review_quality_check_generic_error_title">Այս պահին տեղեկություններ չկան</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Մենք աշխատում ենք խնդիրը լուծելու ուղղությամբ։ Խնդրում ենք նորից ստուգել շուտով:</string>
+    <string name="review_quality_check_generic_error_body">Մենք աշխատում ենք խնդիրը լուծելու ուղղությամբ։ Խնդրում ենք նորից ստուգել շուտով:</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Չկա ցանցային կապակցում</string>
+    <string name="review_quality_check_no_connection_title">Չկա ցանցային կապակցում</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Ստուգեք ձեր ցանցային կապակցումը և փորձեք վերաբեռնել էջը:</string>
+    <string name="review_quality_check_no_connection_body">Ստուգեք ձեր ցանցային կապակցումը և փորձեք վերաբեռնել էջը:</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Այս կարծիքների մասին դեռ տեղեկություններ չկան</string>
+    <string name="review_quality_check_no_analysis_title">Այս կարծիքների մասին դեռ տեղեկություններ չկան</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Իմանալու համար, թե արդյոք այս ապրանքի կարծիքները հուսալի են, ստուգեք կարծիքների որակը: Դա կտևի ընդամենը մոտ 60 վայրկյան:</string>
+    <string name="review_quality_check_no_analysis_body">Իմանալու համար, թե արդյոք այս ապրանքի կարծիքները հուսալի են, ստուգեք կարծիքների որակը: Դա կտևի ընդամենը մոտ 60 վայրկյան:</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Ստուգեք կարծիքի որակը</string>
+    <string name="review_quality_check_no_analysis_link">Ստուգեք կարծիքի որակը</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Փորձեք արտադրանքի կարծիքների մեր վստահելի ուղեցույցը</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2313,11 +2340,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Բացել կարծիքների ստուգիչը</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Բետա</string>
+    <string name="review_quality_check_beta_flag">Բետա</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Բացել կարծիքների որակի ստուգումը</string>
+    <string name="review_quality_check_open_handle_content_description">Բացել կարծիքների ստուգիչը</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Փակել կարծիքի որակի ստուգումը</string>
+    <string name="review_quality_check_close_handle_content_description">Փակել կարծիքների ստուգիչը</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s-ը 5 քայլից</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index cb1319757..eccec0c40 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -105,7 +105,7 @@
 
     <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
-    <string name="erase_action_cfr_message">Tocca ci pro initiar un fresc session in privato. Dele tu chronologia, cookies: omne cosa.</string>
+    <string name="erase_action_cfr_message">Tocca ci pro initiar un nove session de navigation private. Dele tu chronologia, cookies – toto.</string>
 
 
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
@@ -328,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Non ora</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Face de %s tu companion de navigation</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Face de Firefox tu companion de navigation</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s antepone le personas al profitos e defende tu confidentialitate blocante traciatores trans-sitos.\n\nPro saper plus nostre %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox antepone le personas al profitos e defende tu confidentialitate blocante traciatores trans-sitos.\n\nPro saper plus nostre aviso de confidentialitate.</string>
@@ -356,16 +349,10 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Aperir session</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Non ora</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Le notificationes te adjuta a facer plus con %s</string>
 
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Le notificationes te adjuta a facer plus con Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Invia schedas inter apparatos, gere downloads, e recipe consilios re obtener le maximo per %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Invia schedas inter apparatos, gere downloads, e recipe consilios re obtener le maximo per Firefox.</string>
@@ -522,11 +509,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilitate</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servitores de Firefox Account personalisate</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servitores de Firefox Account personalisate</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servitores de conto Mozilla personalisate</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servitor del Sync personalisate</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servitor de Firefox Account/Sync modificate. Quitante le application pro applicar cambiamentos…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servitor de Firefox Account/Sync modificate. Quitante le application pro applicar cambiamentos…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servitor de conto/sync Mozillac modificate. Quitante le application pro applicar cambiamentos…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Conto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -542,9 +533,11 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Authentica te pro synchronisar tu schedas, marca-paginas, contrasignos e plus.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox Account</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account</string>
 
 
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Conto Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconnecte te pro resumer le synchronisation</string>
     <!-- Preference for language -->
@@ -556,7 +549,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuration remote via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Monstrar motores de recerca</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Monstrar motores de recerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Monstrar suggestiones de recerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -575,6 +568,16 @@
     <string name="preferences_account_settings">Parametros de conto</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Auto-completar URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestiones de sponsors</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">Supportar %1$s con occasional suggestiones sponsorisate</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">Suggestiones de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Recipe suggestiones del web relative a tu recerca</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Aperir ligamines in apps</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -676,10 +679,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Le additivo non es supportate</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Le additivo non es supportate</string>
 
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Additivo jam installate</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Additivo jam installate</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Additivos temporarimente disactivate</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Un o plus additivos cessava de functionar, rendente tu systema instabile. %1$s sin successo probava a reinitiar le additivo(s).\n\nLe additivos non sera reinitiate durante tu actual session.\n\nRemover o disactivar additivos pote remediar iste problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Tentar reinitiar additivos</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar con additivos disactivate</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -694,6 +707,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gerer le conto</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambia tu contrasigno, gere collection de datos, o dele tu conto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronisar ora</string>
     <!-- Preference category for sync -->
@@ -718,7 +733,7 @@
     <string name="sync_failed_summary">Synchronisar fallite, ultime successo: %s
 </string>
     <!-- Label summary showing never synced -->
-    <string name="sync_failed_never_synced_summary">Synchronisar fallite. Ultime synchronisate: jammais</string>
+    <string name="sync_failed_never_synced_summary">Synchronisation fallite. Ultime synchronisation: jammais</string>
     <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
     <string name="sync_last_synced_summary">Ultime synchronisation: %s</string>
     <!-- Label summary showing never synced -->
@@ -1768,7 +1783,7 @@
     <!-- Preference option for asking to save passwords in Fenix -->
     <string name="preferences_passwords_save_logins_ask_to_save">Demandar pro salvar</string>
     <!-- Preference option for never saving passwords in Fenix -->
-    <string name="preferences_passwords_save_logins_never_save">Jammais salvar</string>
+    <string name="preferences_passwords_save_logins_never_save">Non salvar jammais</string>
 
     <!-- Preference for autofilling saved logins in Firefox (in web content), %1$s will be replaced with the app name -->
     <string name="preferences_passwords_autofill2">Plenar %1$s</string>
@@ -1993,7 +2008,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Adder</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Salvar</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Salvar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Rediger</string>
 
@@ -2244,7 +2259,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verificator de recension</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificator de recension</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificator de recension</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Recensiones fidabile</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2264,18 +2281,22 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Nos usa le technologia de intelligentia artificial de %s per Mozilla pro controlar le fidabilitate del recensiones de producto. Iste solo te adjutara evalutar le qualitate del recensiones, non qualitate del productos.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Nos assigna a cata recensiones de producto un <b>littera de classification</b> ab A a F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Nos assigna a cata recensiones de producto un <b>littera de classification</b> ab A a F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Recensiones fidabile. Nos crede probabile que le recensiones es de clientes real qui lassava honeste, recensiones sin prejudicios.</string>
 
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nos crede que le revisiones es fidabile.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Nos crede que il ha un mixtura de recensiones fidabile e non fidabile.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Recensiones non fidabile. Nos crede probabile que le recensiones es false o de revisores prevenite.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nos crede que le revisiones non es fidabile.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Le <b>classification adjustate</b> es basate solo sur recensiones que nos crede fidabile.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Aspectos notabile</b> es ab %s recensiones in le ultime 80 dies que nos crede fidabile.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Aspectos notabile</b> es ab %s recensiones in le ultime 80 dies que nos crede fidabile.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Pro saper plus re %s. </string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2285,7 +2306,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Monstrar avisos publicitari in le verificator de recension</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Tu videra avisos publicitari occasional pro productos pertinente. Tote le avisos publicitari debe satisfacer nostre standards de qualitate del recensiones. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Tu videra avisos publicitari occasional pro productos pertinente. Tote le avisos publicitari debe satisfacer nostre standards de qualitate del recensiones. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Tu videra avisos occasional de productos relevante. Nos solo avisara productos  con revisiones fidabile. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Saper plus</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2305,30 +2328,32 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Controlar ora</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Revisiones ancora non bastante</string>
+    <string name="review_quality_check_no_reviews_warning_title">Revisiones ancora non bastante</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Quando iste producto habera plus de recensiones, nos potera controlar su qualitate.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Quando iste producto habera plus de recensiones, nos potera controlar su qualitate.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Le producto non es disponibile</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Si tu videra que iste producto es retro in stock, reporta lo e nos laborara pro controlar le recensiones.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Reporta que iste producto es retro in stock</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Reporta que iste producto es retro in stock</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Reportar si le producto es in stock</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Controlante qualitate de recension</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Controlante qualitate de recension</string>
 
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Controlante qualitate de recension</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Controlante qualitate de recension</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Isto pote prender circa 60 secundas.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Isto pote prender circa 60 secundas.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Gratias pro reportar!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Nos deberea haber info re iste recensiones de producto in 24 horas. Controla plus tarde.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Nos non pote controlar iste recensiones</string>
+    <string name="review_quality_check_not_analyzable_info_title">Nos non pote controlar iste recensiones</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Infortunatemente, nos non pote verificar le qualitate de recension pro certe typos de productos. Per exemplo, cartas dono e diffusion multimedial video, musica, e jocos.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Infortunatemente, nos non pote verificar le qualitate de recension pro certe typos de productos. Per exemplo, cartas dono e diffusion multimedial video, musica, e jocos.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Info a venir tosto</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2338,19 +2363,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Comprendite</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Nulle info disponibile al momento</string>
+    <string name="review_quality_check_generic_error_title">Nulle info disponibile al momento</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Nos labora pro resolver le problema. Retenta tosto.</string>
+    <string name="review_quality_check_generic_error_body">Nos labora pro resolver le problema. Retenta tosto.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Nulle connexion de rete</string>
+    <string name="review_quality_check_no_connection_title">Nulle connexion de rete</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Verifica tu connexion de rete e pois, tenta recargar le pagina.</string>
+    <string name="review_quality_check_no_connection_body">Verifica tu connexion de rete e pois, tenta recargar le pagina.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Nulle info ancora re iste recensiones</string>
+    <string name="review_quality_check_no_analysis_title">Nulle info ancora re iste recensiones</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Pro saper si iste recensiones de producto es fidabile, controla le qualitate de recension. Illo emplea solo circa 60 secundas.</string>
+    <string name="review_quality_check_no_analysis_body">Pro saper si iste recensiones de producto es fidabile, controla le qualitate de recension. Illo emplea solo circa 60 secundas.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Controlar qualitate de recension</string>
+    <string name="review_quality_check_no_analysis_link">Controlar qualitate de recension</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Prova nostre guida digne de fide pro recensiones de producto</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2378,11 +2403,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Aperir le verificator de recension</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Aperir Controlo de qualitate del recensiones</string>
+    <string name="review_quality_check_open_handle_content_description">Aperir le verificator de recension</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Clauder controlo de qualitate del recensiones</string>
+    <string name="review_quality_check_close_handle_content_description">Clauder le verificator de recension</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s ex 5 stellas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index a228276bf..2e88a085c 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -69,6 +69,11 @@
     <!-- True Private Browsing Mode -->
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
     <string name="felt_privacy_desc_card_title">Skilja engin ummerki eftir á þessu tæki</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">%1$s eyðir vefkökunum þínum, vafurferli og gögnum vefsvæðisins þegar þú lokar öllum huliðsgluggum þínum. %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.-->
@@ -97,6 +102,11 @@
     <string name="tcp_cfr_learn_more">Lærððu meira um allsherjar-vefkökuvarnir</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">Ýttu hér til að hefja nýja einkalotu. Eyddu ferlinum þínum, vefkökum - öllu.</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">Aðgangur að myndavél er nauðsynlegur. Farðu í stillingar Android, farðu í Heimildir og gefðu leyfi.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -312,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ekki núna</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Gerðu %s að aðalvafranum þínum</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Gerðu Firefox að aðalvafranum þínum</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s setur fólk framar gróða og ver friðhelgi þína með því að loka fyrir eftirlit á vefsvæðum.\n\nFrekari upplýsingar á %2$s okkar.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox setur fólk framar gróða og ver friðhelgi þína með því að loka fyrir eftirlit á vefsvæðum.\n\nFrekari upplýsingar má sjá á persónuverndarsíðu okkar.</string>
@@ -340,15 +343,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Skrá inn</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ekki núna</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Tilkynningar hjálpa þér að gera meira með %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Tilkynningar hjálpa þér að gera meira með Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Sendu flipa á milli tækja, stýrðu niðurhali og fáðu ráð til að fá sem mest út úr %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Sendu flipa á milli tækja, stýrðu niðurhali og fáðu ráð til að fá sem mest út úr Firefox.</string>
@@ -360,6 +357,12 @@
     <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Prófaðu Firefox-leitargræjuna</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Með Firefox á heimaskjánum þínum muntu hafa greiðan aðgang að vafranum sem setur persónuvernd í fyrsta sæti og hindrar rakningu á milli vefsvæða.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Bæta við Firefox-viðmótshluta</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ekki núna</string>
 
@@ -498,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Aðgengileiki</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Sérsniðinn netþjónn fyrir Firefox miðlarareikning</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Sérsniðinn netþjónn fyrir Firefox miðlarareikning</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Sérsniðinn netþjónn fyrir Mozilla-aðganga</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Sérsniðinn samstillingarþjónn</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox reikningi / samstillingarþjóni hefur verið breytt. Slekk á forritinu til að innleiða breytingar…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox reikningi / samstillingarþjóni hefur verið breytt. Slekk á forritinu til að innleiða breytingar…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-reikningi / samstillingarþjóni hefur verið breytt. Slekk á forritinu til að innleiða breytingar…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Reikningur</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -518,7 +525,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Skráðu þig inn til að samstilla flipana þína, bókamerki, lykilorð og fleira.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox reikningur</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox reikningur</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-reikningur</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Tengjast aftur til að halda áfram með samstillingu</string>
     <!-- Preference for language -->
@@ -530,7 +539,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Kembt með fjartengingu með USB tengi</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Sýna leitarvélar</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Sýna leitarvélar</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Sýna leitartillögur</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -549,6 +558,16 @@
     <string name="preferences_account_settings">Stillingar reiknings</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Sjálfvirk útfylling vefslóða</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Tillögur frá styrktaraðilum</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">Styddu við %1$s með einstaka kostuðum tillögum</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">Tillögur frá %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Fáðu tillögur af vefnum sem tengjast leitinni þinni</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Opna tengla í smáforritum</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -649,9 +668,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Viðbót er ekki studd</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Viðbót er ekki studd</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Viðbót er þegar uppsett</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Viðbót er þegar uppsett</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Viðbætur eru tímabundið óvirkar</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Ein eða fleiri viðbætur hættu að virka, sem gerir kerfið þitt óstöðugt. %1$s reyndi árangurslaust að endurræsa viðbæturnar.\n\nViðbætur verða ekki endurræstar meðan á núverandi lotu stendur.\n\nEf þú fjarlægir eða slekkur á viðbótum gæti það lagað þetta vandamál.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Prófaðu að endurræsa viðbætur</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Halda áfram með viðbætur óvirkar</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -666,6 +695,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Sýsla með reikning</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Breyttu lykilorðinu þínu, sýslaðu með gagnasafnið þitt eða eyddu reikningnum þínum</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Samstilla núna</string>
     <!-- Preference category for sync -->
@@ -1335,6 +1366,8 @@
 
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Huliðsflipum lokað</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Huliðsvafragögnum eytt</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">AFTURKALLA</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1912,7 +1945,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Bæta við</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Vista</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Vista</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Breyta</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2161,7 +2194,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Umsagnaskoðun</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Umsagnaskoðun</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Umsagnaskoðun</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Áreiðanlegar umsagnir</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2182,17 +2217,21 @@
     <string name="review_quality_check_explanation_body_reliability">Við notum gervigreindartækni frá %s hjá Mozilla til að greina áreiðanleika vöruumsagna. Þessi greining mun aðeins hjálpa þér að meta gæði umsagna um vörur, ekki gæði vöru.</string>
 
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Við gefum umsögnum hverrar vöru <b>einkunnir í bókstöfum</b> frá A til F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Við gefum umsögnum hverrar vöru <b>einkunnir í bókstöfum</b> frá A til F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Áreiðanlegar umsagnir. Við teljum að umsagnirnar séu líklega frá raunverulegum viðskiptavinum sem hafa skilið eftir heiðarlegar og óhlutdrægar umsagnir.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Við teljum að umsagnirnar séu áreiðanlegar.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Við teljum að þarna sé blanda af áreiðanlegum og óáreiðanlegum umsögnum.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Óáreiðanlegar umsagnir. Við teljum að umsagnirnar séu líklega falsaðar eða frá hlutdrægum þátttakendum.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Við teljum að umsagnirnar séu óáreiðanlegar.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Aðlöguð einkunn</b> er eingöngu byggð á umsögnum sem við teljum vera áreiðanlegar.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Hápunktar</b> eru úr umsögnum um %s frá síðustu 80 dögum sem við teljum vera áreiðanlegar.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hápunktar</b> eru úr umsögnum um %s frá síðustu 80 dögum sem við teljum vera áreiðanlegar.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Frekari upplýsingar um %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2203,7 +2242,9 @@
     <string name="review_quality_check_settings_recommended_products">Birta auglýsingar í umsagnaskoðun</string>
 
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Þú munt sjá einstaka auglýsingar fyrir viðeigandi vörur. Allar auglýsingar verða að uppfylla gæðastaðla okkar varðandi umsagnir. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Þú munt sjá einstaka auglýsingar fyrir viðeigandi vörur. Allar auglýsingar verða að uppfylla gæðastaðla okkar varðandi umsagnir. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Þú munt sjá einstaka auglýsingar fyrir viðeigandi vörur. Við auglýsum aðeins vörur með áreiðanlegum umsögnum. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Kanna nánar</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2223,27 +2264,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Athuga núna</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ekki nægar umsagnir ennþá</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ekki nægar umsagnir ennþá</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Þegar þessi vara hefur fleiri umsagnir getum við athugað gæði þeirra.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Þegar þessi vara hefur fleiri umsagnir getum við athugað gæði þeirra.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Vara er ekki fáanleg</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Ef þú sérð að þessi vara er aftur komin á lager skaltu tilkynna það til okkar og við munum vinna að því að uppfæra greininguna.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Tilkynna að þessi vara sé aftur á lager</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Tilkynna að þessi vara sé aftur á lager</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Tilkynna þegar vara er til á lager</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Athugar gæði umsagna</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Athugar gæði umsagna</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Athugar gæði umsagna</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Athugar gæði umsagna</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Þetta gæti tekið um 60 sekúndur.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Þetta gæti tekið um 60 sekúndur.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Takk fyrir að tilkynna þetta!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Við ættum að vera með uppfærða greiningu innan 24 klukkustunda. Komdu aftur síðar.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Við getum ekki athugað þessar umsagnir</string>
+    <string name="review_quality_check_not_analyzable_info_title">Við getum ekki athugað þessar umsagnir</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Því miður getum við ekki athugað gæði umsagna fyrir ákveðnar tegundir af vörum. Til dæmis gjafakort og streymd myndskeið, tónlist og leiki.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Upplýsingar koma fljótlega</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2253,15 +2298,51 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Náði því</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Engar upplýsingar tiltækar í augnablikinu</string>
+    <string name="review_quality_check_generic_error_title">Engar upplýsingar tiltækar í augnablikinu</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Við erum að vinna að því að leysa málið. Athugaðu aftur fljótlega.</string>
+    <string name="review_quality_check_generic_error_body">Við erum að vinna að því að leysa málið. Athugaðu aftur fljótlega.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Engin nettenging</string>
+    <string name="review_quality_check_no_connection_title">Engin nettenging</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Athugaðu nettenginguna þína og prófaðu síðan að endurlesa síðuna.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Engar upplýsingar ennþá um þessar umsagnir</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Til að vita hvort umsagnir þessarar vöru séu áreiðanlegar skaltu athuga gæði umsagna. Það tekur aðeins um 60 sekúndur.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Athugaðu gæði umsagna</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Prófaðu traustar leiðbeiningar okkar um vöruumsagnir</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Sjáðu hversu áreiðanlegar vöruumsagnir eru á %1$s áður en þú kaupir. Umsagnaskoðun, tilraunaeiginleiki frá %2$s, er innbyggður beint inn í vafrann. Það virkar á %3$s og einnig %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Með hjálp %1$s frá Mozilla, gerum við þér kleift að forðast hlutdrægar og ósannar umsagnir. Gervigreindarlíkanið okkar er alltaf að batna til að vernda þig sem best þegar þú verslar. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Frekari upplýsingar</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Með því að velja „Já, prófum það“ samþykkir þú %2$s og %3$s hjá %1$s frá Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">persónuverndarstefnu</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">notkunarskilmála</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Já, prófum það</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ekki núna</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Sjáðu hvort þú getur treyst umsögnum þessarar vöru - áður en þú kaupir.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prófaðu umsagnaskoðun</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Eru þessar umsagnir áreiðanlegar? Athugaðu núna aðlagaða einkunn.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Opna umsagnaskoðun</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta-prófunarútgáfa</string>
+    <string name="review_quality_check_beta_flag">Beta-prófunarútgáfa</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Opna umsagnaskoðun</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Loka umsagnaskoðun</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s af 5 stjörnum</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 170a4805d..1f65bc4ee 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -328,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Non adesso</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Rendi %s il tuo browser di riferimento</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Rendi Firefox il tuo browser di riferimento</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s antepone le persone al profitto e protegge la tua privacy bloccando gli elementi traccianti intersito.\n\n Ulteriori informazioni nella nostra %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox antepone le persone al profitto e protegge la tua privacy bloccando gli elementi traccianti intersito.\n\n Ulteriori informazioni nella nostra Informativa sulla privacy.</string>
@@ -356,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Accedi</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Non adesso</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Le notifiche ti aiutano a ottenere di più da %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Le notifiche ti aiutano a ottenere di più da Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Invia schede tra dispositivi, gestisci download e ricevi suggerimenti su come ottenere il massimo da %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Invia schede tra dispositivi, gestisci download e ricevi suggerimenti su come ottenere il massimo da Firefox.</string>
@@ -520,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilità</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Server personalizzato per account Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Server personalizzato per account Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Server personalizzato per account Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Server personalizzato per Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Server per account Firefox/Sync modificato. L’app verrà chiusa per applicare le modifiche…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Server per account Firefox/Sync modificato. L’app verrà chiusa per applicare le modifiche…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Server per account Mozilla e sincronizzazione modificato. L’app verrà chiusa per applicare le modifiche…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -540,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Accedi per sincronizzare schede, segnalibri, password e altro ancora.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Account Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Account Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Account Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Riconnetti per riprendere la sincronizzazione</string>
     <!-- Preference for language -->
@@ -553,7 +546,7 @@
     <string name="preferences_remote_debugging">Debug remoto tramite USB</string>
 
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Visualizza i motori di ricerca</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Visualizza i motori di ricerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostra suggerimenti di ricerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -573,6 +566,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Completamento automatico degli URL</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggerimenti dagli sponsor</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">Supporta %1$s con occasionali suggerimenti sponsorizzati</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">Suggerimenti da %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Ottieni suggerimenti dal Web relativi alla tua ricerca</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Apri i link nelle app</string>
 
@@ -675,9 +678,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Il componente aggiuntivo non è supportato</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Il componente aggiuntivo non è supportato</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Il componente aggiuntivo è già installato</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Il componente aggiuntivo è già installato</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">I componenti aggiuntivi sono temporaneamente disattivati</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Uno o più componenti aggiuntivi hanno smesso di funzionare, rendendo il sistema instabile. %1$s ha tentato di riavviare i componenti aggiuntivi senza successo.\n\nI componenti aggiuntivi non verranno riavviati durante la sessione corrente.\n\nLa rimozione o la disattivazione dei componenti aggiuntivi potrebbe risolvere il problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Prova a riavviare i componenti aggiuntivi</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continua con i componenti aggiuntivi disattivati</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -692,6 +705,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gestisci account</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Cambia la tua password, gestisci la raccolta dati o elimina il tuo account</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizza adesso</string>
     <!-- Preference category for sync -->
@@ -1434,7 +1449,7 @@
     <string name="preference_accessibility_auto_size_summary">La dimensione dei caratteri corrisponderà alle impostazioni di Android. Disattivare per gestire la dimensione dei caratteri separatamente.</string>
 
     <!-- Title for the Delete browsing data preference -->
-    <string name="preferences_delete_browsing_data">Elimina i dati di navigazione</string>
+    <string name="preferences_delete_browsing_data">Elimina dati di navigazione</string>
     <!-- Title for the tabs item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_tabs_title_2">Schede aperte</string>
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
@@ -1978,7 +1993,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Aggiungi</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Salva</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Salva</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modifica</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2229,7 +2244,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Verifica recensioni</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verifica recensioni</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verifica recensioni</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Recensioni affidabili</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2249,17 +2266,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Utilizziamo la tecnologia IA di %s by Mozilla per analizzare l’affidabilità delle recensioni sui prodotti. Questa analisi ti aiuterà a valutare solo la qualità delle recensioni, non quella del prodotto.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Assegniamo alle recensioni di ogni prodotto un <b>voto in lettere</b> dalla A alla F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Assegniamo alle recensioni di ogni prodotto un <b>voto in lettere</b> dalla A alla F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Recensioni affidabili. Riteniamo che le recensioni provengano con buona probabilità da clienti reali che hanno lasciato recensioni oneste e imparziali.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Riteniamo che le recensioni siano affidabili.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Crediamo che ci sia un misto di recensioni affidabili e inaffidabili.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Recensioni inaffidabili. Riteniamo che le recensioni siano false o provenienti da revisori di parte.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Riteniamo che le recensioni siano inaffidabili.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>valutazione rettificata</b> si basa esclusivamente su recensioni che riteniamo affidabili.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Gli elementi <b>in evidenza</b> provengono dalle recensioni su %s degli ultimi 80 giorni che riteniamo affidabili.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Gli elementi <b>in evidenza</b> provengono dalle recensioni su %s degli ultimi 80 giorni che riteniamo affidabili.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Scopri ulteriori informazioni su %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2269,11 +2290,13 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Mostra annunci nella verifica recensioni</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Verranno visualizzati annunci occasionali per prodotti pertinenti. Tutti gli annunci devono soddisfare i nostri standard di qualità per le recensioni. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Verranno visualizzati annunci occasionali per prodotti pertinenti. Tutti gli annunci devono soddisfare i nostri standard di qualità per le recensioni. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Verranno visualizzati annunci occasionali per prodotti pertinenti. Promuoviamo solo prodotti con recensioni affidabili. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Ulteriori informazioni</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
-    <string name="review_quality_check_settings_turn_off">Disattiva la verifica recensioni</string>
+    <string name="review_quality_check_settings_turn_off">Disattiva verifica recensioni</string>
     <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
     <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Altri prodotti da valutare</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
@@ -2290,31 +2313,33 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Controlla adesso</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Non ci sono ancora abbastanza recensioni</string>
+    <string name="review_quality_check_no_reviews_warning_title">Non ci sono ancora abbastanza recensioni</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Non appena questo prodotto avrà più recensioni, saremo in grado di verificarne la qualità.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Non appena questo prodotto avrà più recensioni, saremo in grado di verificarne la qualità.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Il prodotto non è disponibile</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se noti che questo prodotto è di nuovo disponibile, segnalacelo e lavoreremo per verificarne le recensioni.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Segnala che questo prodotto è di nuovo disponibile</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Segnala che questo prodotto è di nuovo disponibile</string>
 
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Segnala che il prodotto è disponibile</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Verifica qualità recensioni</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Verifica qualità recensioni</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Verifica qualità recensioni</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Verifica qualità recensioni</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Questa operazione potrebbe richiedere circa 60 secondi.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Questa operazione potrebbe richiedere circa 60 secondi.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Grazie per la segnalazione!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Dovremmo avere informazioni su questo prodotto entro 24 ore. Ricontrolla più tardi.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Impossibile verificare queste recensioni</string>
+    <string name="review_quality_check_not_analyzable_info_title">Impossibile verificare queste recensioni</string>
 
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Purtroppo non è possibile verificare la qualità delle recensioni per alcuni tipi di prodotto come carte regalo, video in streaming e giochi.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Purtroppo non è possibile verificare la qualità delle recensioni per alcuni tipi di prodotto come carte regalo, video in streaming e giochi.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informazioni disponibili a breve</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2324,22 +2349,22 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">OK</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Nessuna informazione disponibile al momento</string>
+    <string name="review_quality_check_generic_error_title">Nessuna informazione disponibile al momento</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Stiamo lavorando per risolvere il problema. Ricontrolla a breve.</string>
+    <string name="review_quality_check_generic_error_body">Stiamo lavorando per risolvere il problema. Ricontrolla a breve.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Nessuna connessione di rete</string>
+    <string name="review_quality_check_no_connection_title">Nessuna connessione di rete</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Controlla la connessione di rete e prova a ricaricare la pagina.</string>
+    <string name="review_quality_check_no_connection_body">Controlla la connessione di rete e prova a ricaricare la pagina.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Non ci sono ancora informazioni su queste recensioni</string>
+    <string name="review_quality_check_no_analysis_title">Non ci sono ancora informazioni su queste recensioni</string>
 
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Per sapere se le recensioni di questo prodotto sono affidabili, verificane la qualità. Ci vogliono solo circa 60 secondi.</string>
+    <string name="review_quality_check_no_analysis_body">Per sapere se le recensioni di questo prodotto sono affidabili, verificane la qualità. Ci vogliono solo circa 60 secondi.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Verifica qualità della recensioni</string>
+    <string name="review_quality_check_no_analysis_link">Verifica qualità recensioni</string>
     <!-- Headline for review quality check contextual onboarding card. -->
-    <string name="review_quality_check_contextual_onboarding_title">Prova la nostra guida per ottenere affidabili recensioni di prodotti</string>
+    <string name="review_quality_check_contextual_onboarding_title">Prova la nostra guida alle recensioni di prodotti</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
     <string name="review_quality_check_contextual_onboarding_description">Scopri quanto sono affidabili le recensioni dei prodotti su %1$s prima di acquistarli. Verifica recensioni, una funzione sperimentale di %2$s, è integrata direttamente nel browser. Funziona anche su %3$s e %4$s.</string>
     <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2347,13 +2372,13 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Ulteriori informazioni</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">Selezionando “Sì, provalo” accetti l’%2$s e i %3$s di %1$s by Mozilla.</string>
+    <string name="review_quality_check_contextual_onboarding_caption">Selezionando “Sì, provala” accetti l’%2$s e i %3$s di %1$s by Mozilla.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">informativa sulla privacy</string>
     <!-- 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">termini di utilizzo</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">condizioni di utilizzo del servizio</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
-    <string name="review_quality_check_contextual_onboarding_primary_button_text">Sì, provalo</string>
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Sì, provala</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Non ora</string>
     <!-- Text for the first CFR presenting the review quality check feature. -->
@@ -2365,11 +2390,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Apri verifica recensioni</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Apri verifica qualità recensioni</string>
+    <string name="review_quality_check_open_handle_content_description">Apri verifica recensioni</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Chiudi verifica qualità recensioni</string>
+    <string name="review_quality_check_close_handle_content_description">Chiudi verifica recensioni</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s su 5 stelle</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index fb1ab9167..7152107de 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -322,9 +322,6 @@
     <string name="onboarding_home_enable_notifications_negative_button">לא כעת</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">הגדרת %s כדפדפן ברירת המחדל שלך</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">הגדרת Firefox כדפדפן ברירת המחדל שלך</string>
@@ -340,9 +337,6 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">כניסה</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">לא כעת</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">התרעות עוזרות לך לעשות יותר עם %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">התרעות עוזרות לך לעשות יותר עם Firefox</string>
@@ -451,11 +445,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">נגישות</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">שרת Firefox Account מותאם אישית</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">שרת Firefox Account מותאם אישית</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">שרת חשבוןו Mozilla מותאם אישית</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">שרת Sync מותאם אישית</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">שרת Firefox Account/Sync השתנה. היישום ייסגר לצורך להחלת השינויים…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">שרת Firefox Account/Sync השתנה. היישום ייסגר לצורך להחלת השינויים…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">שרת חשבון Mozilla השתנה. היישום ייסגר לצורך להחלת השינויים…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">חשבון</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -471,7 +469,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">יש להתחבר כדי לסנכרן את הלשוניות, הסימניות הססמאות ועוד.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">חשבון Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">חשבון Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">יש להתחבר מחדש כדי להמשיך בסנכרון</string>
     <!-- Preference for language -->
@@ -483,7 +483,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">ניפוי שגיאות מרחוק דרך USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">הצגת מנועי חיפוש</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">הצגת מנועי חיפוש</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 -->
@@ -503,6 +503,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">השלמה אוטומטית של כתובות אתרים</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>
 
@@ -595,9 +605,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">התוספת אינה נתמכת</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">התוספת אינה נתמכת</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">התוספת כבר מותקנת</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">התוספת כבר מותקנת</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">התוספות מושבתות באופן זמני</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">תוספת אחת או יותר הפסיקו לעבוד, מה שהפך את המערכת שלך לבלתי יציבה. %1$s ניסתה להפעיל מחדש את התוספות ללא הצלחה.\n\nתוספות לא יופעלו מחדש במהלך ההפעלה הנוכחית שלך.\n\nהסרה או השבתה של תוספות עשויה לפתור בעיה זו.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">לנסות להפעיל מחדש את התוספות</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">המשך עם התוספות מושבתות</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -612,6 +632,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">ניהול חשבון</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">שינוי הססמה שלך, ניהול איסוף נתונים או מחיקת החשבון שלך</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">סנכרון כעת</string>
     <!-- Preference category for sync -->
@@ -1870,7 +1892,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">הוספה</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">שמירה</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">שמירה</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">עריכה</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2120,7 +2142,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">בודק הסקירות</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">בודק הסקירות</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">בודק הסקירות</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">סקירות אמינות</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2140,17 +2164,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">אנו משתמשים בטכנולוגיית AI של %s מבית Mozilla כדי לנתח את המהימנות של סקירות מוצרים. ניתוח זה רק יעזור לך להעריך את איכות הסקירות, לא את איכות המוצר.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[אנו מקצים לסקירות של כל מוצר <b>ציון אות</b> מ־A עד F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[אנו מקצים לסקירות של כל מוצר <b>ציון אות</b> מ־A עד F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">סקירות אמינות. אנו מאמינים שהסקירות הן ככל הנראה מלקוחות אמיתיים שהשאירו סקירות כנות ושאינן משוחדות.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">אנו מאמינים שסקירות אלו אמינות.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">אנו מאמינים שיש שילוב של סקירות אמינות ובלתי אמינות.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">סקירות בלתי אמינות. אנו מאמינים שהסקירות כנראה מזויפות או של סוקרים מוטים או משוחדים.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">אנו מאמינים שסקירות אלו אינן אמינות.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>הדירוג המותאם</b> מבוסס רק על סקירות שאנו מאמינים שהן אמינות.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>הדגשים</b> הם מסקירות של %s במהלך 80 הימים האחרונים, שאנו מאמינים שהן אמינות.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>הדגשים</b> הם מסקירות של %s במהלך 80 הימים האחרונים, שאנו מאמינים שהן אמינות.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">מידע נוסף על %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2160,7 +2188,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">הצגת פרסומות בבודק הסקירות</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">מדי פעם יוצגו פרסומות עבור מוצרים רלוונטיים. כל הפרסומות חייבות לעמוד בתקני איכות הסקירות שלנו. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">מדי פעם יוצגו פרסומות עבור מוצרים רלוונטיים. כל הפרסומות חייבות לעמוד בתקני איכות הסקירות שלנו. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">מדי פעם יוצגו פרסומות עבור מוצרים רלוונטיים. אנו מפרסמים רק מוצרים עם סקירות אמינות. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">מידע נוסף</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2179,30 +2209,32 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">ביצוע בדיקה כעת</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">אין מספיק סקירות עדיין</string>
+    <string name="review_quality_check_no_reviews_warning_title">אין מספיק סקירות עדיין</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">כאשר למוצר זה יהיו סקירות נוספות, נוכל לבדוק את האיכות שלהן.</string>
+    <string name="review_quality_check_no_reviews_warning_body">כאשר למוצר זה יהיו סקירות נוספות, נוכל לבדוק את האיכות שלהן.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">המוצר אינו זמין</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">אם מוצר זה חזר למלאי, נא לדווח על כך ואנו נעבוד על בדיקת הסקירות.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">שליחת דיווח שמוצר זה חזר למלאי</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">שליחת דיווח שמוצר זה חזר למלאי</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">שליחת דיווח שמוצר זה חזר למלאי</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">בתהליך בדיקת איכות הסקירות</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">בתהליך בדיקת איכות הסקירות</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">בתהליך בדיקת איכות הסקירות</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">בתהליך בדיקת איכות הסקירות</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">פעולה זו יכולה להימשך כ־60 שניות.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">פעולה זו יכולה להימשך כ־60 שניות.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">תודה על הדיווח!</string>
 
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">אמור להיות לנו מידע על הסקירות של מוצר זה תוך 24 שעות. נא לבדוק שוב אז.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">אין באפשרותנו לבדוק סקירות אלה</string>
+    <string name="review_quality_check_not_analyzable_info_title">אין באפשרותנו לבדוק סקירות אלה</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">למרבה הצער, איננו יכולים לבדוק את איכות הסקירות עבור סוגים מסויימים של מוצרים. למשל, כרטיסי מתנה והזרמת וידאו, מוזיקה ומשחקים.</string>
+    <string name="review_quality_check_not_analyzable_info_body">למרבה הצער, איננו יכולים לבדוק את איכות הסקירות עבור סוגים מסויימים של מוצרים. למשל, כרטיסי מתנה והזרמת וידאו, מוזיקה ומשחקים.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">מידע יבוא בקרוב</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2212,23 +2244,23 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">הבנתי</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">אין מידע זמין כרגע</string>
+    <string name="review_quality_check_generic_error_title">אין מידע זמין כרגע</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">אנחנו עובדים על פתרון הבעיה. נא לבדוק שוב בקרוב.</string>
+    <string name="review_quality_check_generic_error_body">אנחנו עובדים על פתרון הבעיה. נא לבדוק שוב בקרוב.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">אין חיבור לרשת</string>
+    <string name="review_quality_check_no_connection_title">אין חיבור לרשת</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">נא לבדוק את החיבור שלך לרשת ולנסות לטעון מחדש את הדף.</string>
+    <string name="review_quality_check_no_connection_body">נא לבדוק את החיבור שלך לרשת ולנסות לטעון מחדש את הדף.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">אין עדיין מידע על סקירות אלה</string>
+    <string name="review_quality_check_no_analysis_title">אין עדיין מידע על סקירות אלה</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">כדי לדעת האם הסקירות של מוצר זה אמינות, יש לבדוק את איכות הסקירות. פעולה זו נמשכת כ־60 שניות.</string>
+    <string name="review_quality_check_no_analysis_body">כדי לדעת האם הסקירות של מוצר זה אמינות, יש לבדוק את איכות הסקירות. פעולה זו נמשכת כ־60 שניות.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">בדיקת איכות הסקירות</string>
+    <string name="review_quality_check_no_analysis_link">בדיקת איכות הסקירות</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">נסו את המדריך המהימן שלנו לסקירות מוצרים</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
-    <string name="review_quality_check_contextual_onboarding_description">ניתן לבדוק עד כמה ביקורות מוצר אמינות ב-%1$s לפני הקנייה. בודק הסקירות, תכונה ניסיונית מאת %2$s, מובנה ישירות בדפדפן. הוא עובד גם על %3$s ו־%4$s.</string>
+    <string name="review_quality_check_contextual_onboarding_description">ניתן לבדוק עד כמה ביקורות מוצר אמינות ב־%1$s לפני הקנייה. בודק הסקירות, תכונה ניסיונית מאת %2$s, מובנה ישירות בדפדפן. הוא עובד גם על %3$s ו־%4$s.</string>
     <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_contextual_onboarding_learn_more">באמצעות הכוח של %1$s מאת Mozilla, אנו עוזרים לך להימנע מסקירות מוטות ולא אותנטיות. מודל הבינה המלאכותית שלנו משתפר תמיד כדי להגן עליך בזמן הקנייה. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
@@ -2253,11 +2285,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">פתיחת בודק הסקירות</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">פתיחת הבודק של איכות הסקירות</string>
+    <string name="review_quality_check_open_handle_content_description">פתיחת בודק הסקירות</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">סגירת הבודק של איכות הסקירות</string>
+    <string name="review_quality_check_close_handle_content_description">סגירת בודק הסקירות</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s מתוך 5 כוכבים</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2b637da90..d5e74aed9 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -329,16 +329,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">後で</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s をいつものブラウザーに</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox をいつものブラウザーに</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s はユーザーのことを第一に考え、クロスサイトトラッカーからあなたのプライバシーを守ります。\n\n%2$s もご覧ください。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox はユーザーのことを第一に考え、クロスサイトトラッカーからあなたのプライバシーを守ります。\n\n詳細はプライバシー通知をご覧ください。</string>
@@ -358,15 +351,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">ログイン</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">後で</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">通知をオンにして %s をさらに活用しましょう</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">通知をオンにして Firefox をさらに活用しましょう</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">通知を使って他の端末にタブを送信したり、ダウンロードを管理したり、%s を最大限に活用するためのヒントを受け取れます。</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">通知を使って他の端末にタブを送信したり、ダウンロードを管理したり、Firefox を最大限に活用するためのヒントを受け取れます。</string>
@@ -525,11 +512,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">アクセシビリティ</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">カスタム Firefox アカウントサーバー</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">カスタム Firefox アカウントサーバー</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">カスタム Mozilla アカウントサーバー</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">カスタム Sync サーバー</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox アカウント/Sync サーバーが変更されました。変更を適用するためにアプリケーションを終了しています…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox アカウント/Sync サーバーが変更されました。変更を適用するためにアプリケーションを終了しています…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla アカウント/Sync サーバーが変更されました。変更を適用するためにアプリケーションを終了しています…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">アカウント</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -545,7 +536,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">ログインしてタブやブックマーク、パスワードなどを同期しましょう。</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox アカウント</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox アカウント</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">再接続して同期を再開</string>
     <!-- Preference for language -->
@@ -557,7 +550,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB 経由でリモートデバッグする</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">検索エンジンを表示する</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">検索エンジンを表示する</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 -->
@@ -577,6 +570,16 @@
 
     <!-- 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>
 
@@ -677,9 +680,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">サポートされていないアドオンです</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">サポートされていないアドオンです</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">アドオンはすでにインストールされています。</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">アドオンはすでにインストールされています。</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">アドオンは一時的に無効化されています</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">システムを不安定にしている 1 つ以上のアドオンが動作を停止しました。 %1$s によるアドオンの再起動が失敗しました。\n\nアドオンは現在のセッション中に再起動されません。\n\nアドオンを削除または無効にすると、この問題が解決される可能性があります。</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">アドオンを再起動してみてください</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">アドオンを無効にして続ける</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -695,6 +709,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">アカウント管理</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">パスワードの変更、データ収集の管理、またはアカウントの削除</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">今すぐ同期</string>
     <!-- Preference category for sync -->
@@ -1965,7 +1981,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">追加</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">保存</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">保存</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">編集</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2216,7 +2232,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">レビューチェッカー</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">レビューチェッカー</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">レビューチェッカー</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">信頼できるレビュー</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2237,17 +2255,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">私たちは、%s by Mozilla の AI 技術を用いて製品レビューの信頼性を解析します。これは製品そのものの品質ではなく、製品の信頼できるレビューへのアクセスを助けるものです。</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[私たちは、各製品のレビューを A から F までの <b>レターグレード</b> で評価します。]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[私たちは、各製品のレビューを A から F までの <b>レターグレード</b> で評価します。]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">信頼できるレビューです。これは正直で偏見を持たない本物の顧客によるレビューであると思われます。</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">信頼できるレビューと思われます。</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">信頼できるレビューと信頼できないレビューが混在していると思われます。</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">信頼できないレビューです。これは偽物または偏見を持ったレビュアーによるレビューであると思われます。</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">信頼できないレビューです。</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>調整されたレート</b> は私たちが信頼するに足ると評価したレビューのみを基にしています。]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>注目レビュー</b> は最近 80 日以内の %s からのレビューで私たちが信頼するに足ると評価したものです。]]></string>
+    <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. -->
@@ -2257,7 +2279,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">レビューチェッカーに広告を表示する</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">時々、関連製品の広告が表示されます。すべての広告は私たちのレビュー品質基準を満たしています。%s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">時々、関連製品の広告が表示されます。すべての広告は私たちのレビュー品質基準を満たしています。%s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">時々、関連製品の広告が表示されます。私たちはレビュー品質基準を満たした信頼できる製品のみを広告しています。%s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">詳細情報</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2277,30 +2301,32 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">今すぐ確認</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">まだ十分な数のレビューがありません</string>
+    <string name="review_quality_check_no_reviews_warning_title">まだ十分な数のレビューがありません</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">この製品の品質を確認可能な数のレビューが掲載されるまでお待ちください。</string>
+    <string name="review_quality_check_no_reviews_warning_body">この製品の品質を確認可能な数のレビューが掲載されるまでお待ちください。</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">製品が利用できません</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">この製品が再入荷されている場合はご報告ください。その製品レビューを確認します。</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">製品が再入荷されたことを報告する</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">製品が再入荷されたことを報告する</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">製品の在庫があることを報告する</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">レビューの品質の確認</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">レビューの品質の確認</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">レビューの品質の確認</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">レビューの品質の確認</string>
 
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">これには約 60 秒かかります。</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">これには約 60 秒かかります。</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">ご報告ありがとうございます。</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">この製品のレビュー情報は 24 時間以内に更新されます。後でもう一度確認してください。</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">これらのレビューは確認できません</string>
+    <string name="review_quality_check_not_analyzable_info_title">これらのレビューは確認できません</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">残念ながら、特定の種類の商品のレビュー品質は確認できません。たとえば、ギフトカードやストリーミングビデオ、音楽、ゲームなどです。</string>
+    <string name="review_quality_check_not_analyzable_info_body">残念ながら、特定の種類の商品のレビュー品質は確認できません。たとえば、ギフトカードやストリーミングビデオ、音楽、ゲームなどです。</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">情報は間もなく更新</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2310,20 +2336,20 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">OK</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">現在入手可能な情報はありません</string>
+    <string name="review_quality_check_generic_error_title">現在入手可能な情報はありません</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">現在、問題の解決に取り組んでいます。後でもう一度確認してください。</string>
+    <string name="review_quality_check_generic_error_body">現在、問題の解決に取り組んでいます。後でもう一度確認してください。</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">ネットワーク接続がありません</string>
+    <string name="review_quality_check_no_connection_title">ネットワーク接続がありません</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">ネットワーク接続を確認し、ページを再度読み込んでみてください。</string>
+    <string name="review_quality_check_no_connection_body">ネットワーク接続を確認し、ページを再度読み込んでみてください。</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">これらのレビューに関する情報はまだありません</string>
+    <string name="review_quality_check_no_analysis_title">これらのレビューに関する情報はまだありません</string>
 
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">この製品のレビューが信頼できるかどうかを確認するには、レビュー品質を確認してください。所要時間はわずか 60 秒ほどです。</string>
+    <string name="review_quality_check_no_analysis_body">この製品のレビューが信頼できるかどうかを確認するには、レビュー品質を確認してください。所要時間はわずか 60 秒ほどです。</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">レビューの品質を確認</string>
+    <string name="review_quality_check_no_analysis_link">レビューの品質を確認</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">製品レビューの信頼できるガイドをお試しください</string>
 
@@ -2353,11 +2379,11 @@
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">レビューチェッカーを開く</string>
 
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">レビュー品質チェックを開く</string>
+    <string name="review_quality_check_open_handle_content_description">レビューチェッカーを開く</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">レビュー品質チェックを閉じる</string>
+    <string name="review_quality_check_close_handle_content_description">レビューチェッカーを閉じる</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">スター 5 個中 %1$s 個</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 26c5ff568..214cb9aee 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -63,6 +63,19 @@
     <string name="private_browsing_placeholder_description_2">%1$s გაასუფთავებს თქვენი ძიებისა და ნახვების ისტორიას ყველა პირადი ჩანართის დახურვისას ან პროგრამიდან გამოსვლისას. მართალია, ეს არ დაფარავს თქვენს ვინაობას საიტებისა და ინტერნეტის მომწოდებლისგან, მაგრამ დაგეხმარებათ დაიცვათ პირადი მონაცემები ამ მოწყობილობის სხვა მომხმარებლებისგან.</string>
     <string name="private_browsing_common_myths">არასწორი წარმოდგენები პირადი თვალიერების რეჟიმზე</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">გამოიყენეთ მოწყობილობა კვალის დაუტოვებლად</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">%1$s წაშლის თქვენს ფუნთუშებს, ისტორიასა და საიტის მონაცემებს ყველა პირადი ფანჯრის დახურვისას. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">ვისთვის შეიძლება იყოს ხილული ჩემი საქმიანობა?</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">გახსენით ახალი პირადი ჩანართი ერთი შეხებით.</string>
@@ -86,6 +99,11 @@
     <string name="tcp_cfr_learn_more">გაეცანით ფუნთუშებისგან ყოველმხრივ დაცვას</string>
 
 
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">შეეხეთ აქ ახალი პირადი სეანსის დასაწყებად. წაშალეთ თქვენი ისტორია, ფუნთუშები — ყველაფერი.</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">კამერასთან წვდომაა საჭირო. გადადით Android-პარამეტრებში, შეეხეთ ნებართვებს და შემდეგ დაშვებას.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -274,7 +292,7 @@
     <!-- Home onboarding dialog sign into sync screen title text. -->
     <string name="onboarding_home_sync_title_3">ეკრანებს შორის გადართვა ჯერ არნახული სიმარტივით</string>
     <!-- Home onboarding dialog sign into sync screen description text. -->
-    <string name="onboarding_home_sync_description">განაგრძეთ, სადაც გაჩერდით სხვა მოწყობილობიდან ჩანართების წამოღებით ახლა უკვე საწყის გვერდზე.</string>
+    <string name="onboarding_home_sync_description">განაგრძეთ იქიდან, სადაც შეჩერდით, სხვა მოწყობილობიდან ჩანართების წამოღებით ახლა უკვე საწყის გვერდზე.</string>
     <!-- Text for the button to continue the onboarding on the home onboarding dialog. -->
     <string name="onboarding_home_get_started_button">დაიწყეთ</string>
     <!-- Text for the button to navigate to the sync sign in screen on the home onboarding dialog. -->
@@ -300,16 +318,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">ახლა არა</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">გამოიყენეთ %s ძირითად ბრაუზერად</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">გამოიყენეთ Firefox ძირითად ბრაუზერად</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ხალხს მოგებაზე წინ აყენებს და იცავს თქვენს პირად მონაცემებს საიტთაშორისი მეთვალყურეებისგან.\n\nვრცლად იხილეთ %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ხალხს მოგებაზე წინ აყენებს და იცავს თქვენს პირად მონაცემებს საიტთაშორისი მეთვალყურეებისგან.\n\nვრცლად იხილეთ პირადულობის განაცხადი.</string>
@@ -323,20 +334,14 @@
     <!-- Title for sign in to sync screen. -->
     <string name="juno_onboarding_sign_in_title" tools:ignore="UnusedResources">მოქნილად გადაერთეთ ტელეფონიდან ნოუთბუქზე და უკან</string>
     <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">გამოიყოლეთ ჩანართები და სანიშნები სხვა მოწყობილობიდან, რომ განაგრძოთ იქიდანვე, სადაც გაჩერდით.</string>
+    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">გამოიყოლეთ ჩანართები და სანიშნები სხვა მოწყობილობიდან, რომ განაგრძოთ იქიდანვე, სადაც შეჩერდით.</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">შესვლა</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">ახლა არა</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">შეტყობინებებით შეძლებთ, უკეთ გამოიყენოთ %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">შეტყობინებები დაგეხმარებათ, სრულყოფილად გამოიყენოთ Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">გაგზავნეთ ჩანართები მოწყობილობებს შორის, მართეთ ჩამოტვირთვები და მიიღეთ რჩევები, რომ სრულყოფილად გამოიყენოთ %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">გაგზავნეთ ჩანართები მოწყობილობებს შორის, მართეთ ჩამოტვირთვები და მიიღეთ რჩევები, რომ სრულყოფილად გამოიყენოთ Firefox.</string>
@@ -345,6 +350,19 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">ახლა არა</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">სცადეთ Firefox-ის საძიებო სამარჯვი</string>
+
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Firefox-ის სამარჯვის გამოტანით მთავარ ეკრანზე მარტივი წვდომა გექნებათ პირადულობის უწინარესობის უზრუნველმყოფ და საიტთაშორისი მეთვალყურეების ამრიდებელ ბრაუზერთან.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Firefox-სამარჯვის დამატება</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ახლა არა</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">ახალი %1$s-ჩანართის გახსნა</string>
@@ -410,14 +428,14 @@
     <!-- Preference for removing cookie/consent banners from sites automatically. See reduce_cookie_banner_summary for additional context. -->
     <string name="preferences_cookie_banner_reduction">ფუნთუშის მოთხოვნების შემცირება</string>
     <!-- Preference for rejecting or removing as many cookie/consent banners as possible on sites. See reduce_cookie_banner_summary for additional context. -->
-    <string name="reduce_cookie_banner_option">შეამცირეთ ფუნთუშის მოთხოვნები</string>
+    <string name="reduce_cookie_banner_option">ფუნთუშის მოთხოვნების შემცირება</string>
     <!-- Summary of cookie banner handling preference if the setting disabled is set to off -->
     <string name="reduce_cookie_banner_option_off">გამორთ.</string>
     <!-- Summary of cookie banner handling preference if the setting enabled is set to on -->
     <string name="reduce_cookie_banner_option_on">ჩართ.</string>
 
     <!-- Summary for the preference for rejecting all cookies whenever possible. The first parameter is the application name -->
-    <string name="reduce_cookie_banner_summary_1">%1$s თავად ეცდება უარყოს ფუნთუშების მოთხოვები და მოაცილოს აბრები.</string>
+    <string name="reduce_cookie_banner_summary_1">%1$s თავად ეცდება უარყოს ფუნთუშების მოთხოვნები საიტებზე და მოაცილოს აბრები.</string>
     <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
     <string name="reduce_cookie_banner_off_for_site">გამორთ. ამ საიტზე</string>
     <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -458,7 +476,7 @@
     <string name="reduce_cookie_banner_dialog_change_setting_button">ნებართვა</string>
 
     <!-- Description of the preference to enable "HTTPS-Only" mode. -->
-    <string name="preferences_https_only_summary">თავადვე შეეცდება დაუკავშირდეს საიტებს დაშიფრული HTTPS-ოქმით, მეტი უსაფრთხოებისთვის.</string>
+    <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 -->
@@ -480,11 +498,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">ხელმისაწვდომობა</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Firefox-ანგარიშის მითითებული სერვერი</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-ანგარიშის მითითებული სერვერი</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Mozilla-ანგარიშის მითითებული სერვერი</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">დასინქრონების მითითებული სერვერი</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">შეცვალა Firefox-ანგარიშის/სინქრონიზაციის სერვერი. პროგრამა დაიხურება ცვლილებების ასახვისთვის…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">შეცვალა Firefox-ანგარიშის/სინქრონიზაციის სერვერი. პროგრამა დაიხურება ცვლილებების ასახვისთვის…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-ანგარიშის/სინქრონიზაციის სერვერი შეიცვალა. პროგრამა დაიხურება ცვლილებების ასახვისთვის…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">ანგარიში</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -500,7 +522,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">შედით ანგარიშზე, რომ დაასინქრონოთ თქვენი ჩანართები, სანიშნები, პაროლები და სხვ.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-ანგარიში</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-ანგარიში</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">ხელახლა დაკავშირება სინქრონიზაციის აღსადგენად</string>
     <!-- Preference for language -->
@@ -513,7 +537,7 @@
     <string name="preferences_remote_debugging">დაშორებული USB-გამართვა</string>
 
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">საძიებო სისტემების ჩვენება</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">საძიებო სისტემების ჩვენება</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 -->
@@ -532,6 +556,16 @@
     <string name="preferences_account_settings">ანგარიშის პარამეტრები</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">ბმულების თვითდასრულება</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 -->
@@ -631,9 +665,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">დამატება არაა მხარდაჭერილი</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">დამატება არაა მხარდაჭერილი</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">დამატება უკვე ჩადგმულია</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">დამატება უკვე ჩადგმულია</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">დამატებები დროებით ამორთულია</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">ერთი ან რამდენიმე დამატება ვეღარ მუშაობს და აფერხებს სისტემის მდგრადობას. %1$s წარუმატებლად შეეცადა დამატებ(ებ)ის ხელმეორედ გაშვებას.\n\nდამატებები ვერ გაეშვება ხელახლა მიმდინარე სეანსზე.\n\nდამატებების მოცილებამ ან ამორთვამ შეიძლება მოაგვაროს ხარვეზი.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">სცადეთ დამატებების ახლიდან ჩართვა</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">განაგრძეთ ამორთული დამატებებით</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -648,6 +692,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">ანგარიშის მართვა</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">შეცვალეთ თქვენი პაროლი, მართეთ მონაცემთა აღრიცხვა ან წაშალეთ თქვენი ანგარიში</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">დასინქრონება ახლავე</string>
     <!-- Preference category for sync -->
@@ -1320,6 +1366,8 @@
     <string name="snackbar_private_tab_closed">პირადი ჩანართი დაიხურა</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">პირადი ჩანართები დაიხურა</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">პირადი ფანჯრის მონაცემები გასუფთავებულია</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">დაბრუნება</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1348,9 +1396,9 @@
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL-ს ასლი აღებულია</string>
     <!-- Sample text for accessibility font size -->
-    <string name="accessibility_text_size_sample_text_1">ეს ტექსტი ნიმუშია. იგი აჩვენებს, თუ როგორ გამოჩნდება ნაწერი, ამ პარამეტრით ზომის გაზრდისას ან შემცირებისას.</string>
+    <string name="accessibility_text_size_sample_text_1">ეს ტექსტი ნიმუშია. იგი აჩვენებს, თუ როგორ გამოჩნდება ნაწერი ამ პარამეტრით ზომის გაზრდისას ან შემცირებისას.</string>
     <!-- Summary for Accessibility Text Size Scaling Preference -->
-    <string name="preference_accessibility_text_size_summary">გაზარდეთ ან შეამცირეთ ტექსტის ზომა საიტებზე</string>
+    <string name="preference_accessibility_text_size_summary">გაზარდეთ ან შეამცირეთ ნაწერის ზომა საიტებზე</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_font_size_title">შრიფტის ზომა</string>
 
@@ -1435,7 +1483,7 @@
     <!-- Text for the onboarding welcome message. -->
     <string name="onboarding_message" moz:RemovedIn="118" tools:ignore="UnusedResources">ბრაუზერი შექმნილი ხალხისთვის, და არა მოგებისთვის</string>
     <!-- Text for the Firefox account onboarding sign in card header. -->
-    <string name="onboarding_account_sign_in_header" moz:RemovedIn="118" tools:ignore="UnusedResources">განაგრძეთ იქიდან, სადაც გაჩერდით.</string>
+    <string name="onboarding_account_sign_in_header" moz:RemovedIn="118" tools:ignore="UnusedResources">განაგრძეთ იქიდან, სადაც შეჩერდით</string>
     <!-- Text for the button to learn more about signing in to your Firefox account. -->
     <string name="onboarding_manual_sign_in_description" moz:RemovedIn="118" tools:ignore="UnusedResources">დაასინქრონეთ ჩანართები და პაროლები მოწყობილობებს შორის შეუფერხებლად გადასვლისთვის.</string>
     <!-- Text for the button to manually sign into Firefox account. -->
@@ -1904,7 +1952,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">დამატება</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">შენახვა</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">შენახვა</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">ჩასწორება</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2153,6 +2201,175 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">პარამეტრებზე გადასვლა</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">მიმოხილვის შემმოწმებელი</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">მიმოხილვის შემმოწმებელი</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">სანდო მიმოხილვები</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">შერეულად სანდო და არასანდო მიმოხილვები</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">არასანდო მიმოხილვები</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">რამდენად სანდოა ეს მიმოხილვები?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">შესწორებული შეფასება</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">არასანდო მიმოხილვები მოცილებულია</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">გამოსარჩევი ბოლო მიმოხილვებიდან</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">როგორ განისაზღვრება მიმოხილვის ხარისხი</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">ჩვენ ვიყენებთ ხელოვნური ინტელექტის შესაძლებლობებს Mozilla-ს საიტიდან %s მიმოხილვების სანდოობის გადასამოწმებლად. ეს მხოლოდ მიმოხილვის ხარისხის შეფასებაში დაგეხმარებათ და არა – ნაწარმის ხარისხის.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[გასაყიდ ნაწარმზე თითოეულ მიმოხილვას ეწერება <b>ნიშნები</b> A-დან F-მდე.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">სანდო მიმოხილვები. მიგვაჩნია, რომ ეს მიმოხილვები, სავარაუდოდ, ნამდვილი მომხმარებლებისგანაა დატოვებული პატიოსნად და მიუკერძოებლად.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">მიგვაჩნია, რომ მიმოხილვები სანდო უნდა იყოს.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">მიგვაჩნია, რომ შერეულადაა სანდო და არასანდო მიმოხილვები.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">არასანდო მიმოხილვები. მიგვაჩნია, რომ ეს მიმოხილვები, სავარაუდოდ, ყალბი ან მიკერძოებული მიმომხილველებისგანაა.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">მიგვაჩნია, რომ მიმოხილვები არაა სანდო.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>შესწორებული შეფასება</b> ეყრდნობა მხოლოდ იმ მიმოხილვებს, რომლებიც სანდოდ მიგვაჩნია.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<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">როგორ განსაზღვრავს Mozilla-ს %s მიმოხილვის ხარისხს</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">პარამეტრები</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">რეკლამების ჩვენება მიმოხილვის შემმოწმებელში</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">დროდადრო იხილავთ რეკლამებს ნაწარმის შესაბამისად. ყველა რეკლამა უნდა აკმაყოფილებდეს მიმოხილვის ხარისხის ჩვენს მოთხოვნებს. %s
+</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">დროდადრო იხილავთ რეკლამებს  ნაწარმის შესაბამისად. ჩვენ მხოლოდ სანდო მიმოხილვების მქონეს გთავაზობთ. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">ვრცლად</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">მიმოხილვის შემმოწმებლის გამორთვა</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">სხვა მსგავსი</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">რეკლამა – %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">მიმოხილვის შემმოწმებელს უზრუნველყოფს %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">მიმოხილვის შემმოწმებელს უზრუნველყოფს %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s Mozilla-სგან</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">ახალი მონაცემები შესამოწმებლად</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">შემოწმება ახლავე</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">საკმარისი მიმოხილვები ჯერ არაა</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">როცა ამ ნაწარმს ექნება მეტი მიმოხილვა, შემდეგ შეგვეძლება მათი ხარისხის შემოწმება.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">გასაყიდი ნაწარმი მიუწვდომელია</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">თუ ნახავთ, რომ ნაწარმი დააბრუნეს გასაყიდად, მოგვახსენეთ და ვიმუშავებთ მიმოხილვების შესამოწმებლად.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">მოხსენება ნაწარმის გასაყიდად დაბრუნებისას</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">მოხსენება გასაყიდი პროდუქტისა</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">მოწმდება მიმოხილვის ხარისხი</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">მოწმდება მიმოხილვის ხარისხი</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">შეიძლება გასტანოს 60 წამს.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">გმადლობთ მოხსენებისთვის!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">ამ ნაწარმის მიმოხილვების შესახებ მონაცემები გვექნება 24 საათში. გთხოვთ, მოგვიანებით დაუბრუნდეთ.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">ვერ მოწმდება ეს მიმოხილვები</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">სამწუხაროდ, გარკვეული სახის ნაწარმზე მიმოხილვის ხარისხი ვერ შემოწმდება. ასეთებია მაგალითად, სასაჩუქრე ბარათები, ეთერით გადასაცემი ვიდეო, მუსიკა და თამაშები.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">მონაცემები მალე იქნება</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">ამ ნაწარმის მიმოხილვების შესახებ მონაცემები გვექნება 24 საათში. გთხოვთ, მოგვიანებით დაუბრუნდეთ.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">დამუშავებული მონაცემები განახლებულია</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">გასაგებია</string>
+
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">მონაცემები ამჟამად მიუწვდომელია</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">ჩვენ ვმუშაობთ საკითხის გადასაწყვეტად. გთხოვთ, მოგვიანებით დაუბრუნდეთ.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">ქსელთან კავშირი არაა</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">შეამოწმეთ ქსელთან კავშირი და სცადეთ გვერდის ხელახლა ჩატვირთვა.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">ამ მიმოხილვების შესახებ მონაცემები ჯერ არაა</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">იმის გასაგებად, სანდოა თუ არა ამ ნაწარმის მიმოხილვები, გადაამოწმეთ მიმოხილვის ხარისხი. მხოლოდ მიახლოებით 60 წამს გასტანს.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">მიმოხილვის ხარისხის შემოწმება</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">გამოცადეთ ჩვენი სანდო მეგზური საყიდლების მიმოხილვებისთვის</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">იხილეთ, რამდენად სანდოა გასაყიდი ნაწარმის მიმოხილვები %1$s საიტზე მის შეძენამდე. მიმოხილვის შემმოწმებელი, საცდელი შესაძლებლობა, რომელსაც გთავაზობთ %2$s და პირდაპირ ბრაუზერშივეა ჩაშენებული. მხარდაჭერილია %3$s და აგრეთვე %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Mozilla-ს %1$s-ის ძლევამოსილებით ჩვენ დაგეხმარებით მიკერძოებული და ყალბი მიმოხილვების თავიდან აცილებაში. ჩვენი AI-მოდელი მუდმივად იხვეწება საყიდლების შეძენისას თქვენს დასაცავად. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">ვრცლად</string>
+
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">თუ მიუთითებთ „დიახ, მსურს ვცადო“, ესე იგი თქვენთვის მისაღებია Mozilla-ს %1$s-ის %2$s და %3$s.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">პირადულობის დებულება</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">გამოყენების პირობები</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">დიახ, მსურს ვცადო</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">ახლა არა</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">გაარკვიეთ, სანდოა თუ არა გასაყიდი ნაწარმის მიმოხილვები — მის შეძენამდე.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">სცადეთ მიმოხილვის შემმოწმებელი</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">სანდოა ეს მიმოხილვები? შეამოწმეთ ახლავე შესწორებული შეფასების სანახავად.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">მიმოხილვის შემმოწმებლის გახსნა</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">საცდელი Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">მიმოხილვის შემმოწმებლის გახსნა</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">მიმოხილვის შემმოწმებლის დახურვა</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s ვარსკვლავი 5-იდან</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">მოკლედ</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">ვრცლად</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">ხარისხი</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">ფასი</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">მიწოდება</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">შეფუთვა და იერსახე</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">მეტოქეებთან შედარებით</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">აკეცვა</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index a98db90cb..b529b4cf3 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -69,6 +69,10 @@
 Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
      </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ur ttaǧǧa ara akk later ɣef yibenk-a</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">Senker iccer uslig uḍfir s yiwen usiti kan.</string>
@@ -229,6 +233,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Agilal agejdan</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">Sfeḍ azray n tunigin</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Fren tutlayt</string>
@@ -307,16 +314,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="onboarding_home_enable_notifications_negative_button">Mačči tura</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Seqdec %s d iminig-inek amezwer.</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Seqdec Firefox d iminig-inek amezwer</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s izewwir deg yimdanen uqbel idrimen, yekkat ɣef tudert-ik tabaḍnit s usewḥel n yineḍfaren n gar yismal.\n\Issin ugar deg %2$s nneɣ.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox izewwir deg yimdanen uqbel idrimen, yekkat ɣef tudert-ik tabaḍnit s usewḥel n yineḍfaren n gar yismal.\n\Issin ugar deg Tasertit-nneɣ tbaḍnit.</string>
@@ -335,15 +335,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Kcem</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Mačči tura</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Ilɣa ttɛawanen ad tgeḍ ugar akked %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Ilɣa ttɛawanen ad tgeḍ ugar akked Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Azen accaren gar ibenkan, sefrek isadaren, rnu awi iwellihen akken ara tfaṛseḍ ugar seg %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Azen accaren gar ibenkan, sefrek isadaren, rnu awi iwellihen akken ara tfaṛseḍ ugar seg Firefox.</string>
@@ -493,11 +487,11 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Tuffart</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Sagen aqeddac n umiḍan Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Sagen aqeddac n umiḍan Firefox</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Sagen aeddac n umtawi</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Amiḍan Firefox/Aqeddac n umtawi ittwasnifel, Ffeɣ seg usnas akken ad iddu usnifel…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Amiḍan Firefox/Aqeddac n umtawi ittwasnifel, Ffeɣ seg usnas akken ad iddu usnifel…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Amiḍan</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -513,7 +507,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Qqen ɣer waccaren yemtawan, ticraḍ n yisebtar, awalen uffiren d wugar n wayen-nniḍen.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Amiḍan Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Amiḍan Firefox</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ales tuqqna akken ad ikemmel umtawi</string>
     <!-- Preference for language -->
@@ -648,9 +642,19 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Azegrir ur yettusefrak ara</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Azegrir ur yettusefrak ara</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Azegrir yettusebded yakan</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Azegrir yettusebded yakan</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Azegrir yensa i kra n wakud</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Yiwen neɣ ugar n yizegrar ḥebsen, rran anagraw-ik d arurkid. %1$s ur yessaweḍ ara ad yales asenker n uzegrir(yizegrar).\n\nIzegrar ugin ad alsen tanekra ɣef teɣzi n tiɣimit-a.\n\Kkes neɣ sens izegrar-a, ahat ad yefru wugur-a.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Ɛreḍ asenker n uzegrir</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Kemml s uzegrir yensa</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -2201,7 +2205,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Adellel sɣur %s</string>
     <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
-    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources">Amsenqad n tamawt yella-d s lmendad n %s.</string>
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Amsenqad n tamawt yella-d s lmendad n %s.</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s s Mozilla</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2209,11 +2213,11 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Senqed tura</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ulac ddeqs n tamiwin akka tura</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ulac ddeqs n tamiwin akka tura</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Afaris ulac-it</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Aya yezmer ad yeṭṭef 60 tsinin.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Aya yezmer ad yeṭṭef 60 tsinin.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Tanemmirt ɣef tuzna n uneqqis!</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
@@ -2235,7 +2239,9 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Ldi amsenqad n tamawt</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Ldi amsenqad n tamawt</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">Sken drus</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 2616082c5..f7603607e 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -321,16 +321,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Қазір емес</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s негізгі браузер етіп орнатыңыз</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox-ты негізгі браузер етіп орнатыңыз</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s сайтаралық трекерлерді блоктау арқылы адамдарды табыстан жоғары қояды және жекелігіңізді қорғайды.\n\nТолығырақ ақпаратты %2$s ішінен алыңыз.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox сайтаралық трекерлерді блоктау арқылы адамдарды табыстан жоғары қояды және жекелігіңізді қорғайды.\n\nТолығырақ ақпаратты жекелік хабарламамыздан алыңыз.</string>
@@ -349,15 +342,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Кіру</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Қазір емес</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Хабарландырулар %s арқылы көбірек жұмыс бітіруге көмектеседі</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Хабарландырулар Firefox арқылы көбірек жұмыс бітіруге көмектеседі</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Құрылғылар арасында беттерді жіберіңіз, жүктемелеріңізді басқарыңыз және %s мүмкіндігін барынша пайдалану туралы кеңестер алыңыз.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Құрылғылар арасында беттерді жіберіңіз, жүктемелеріңізді басқарыңыз және Firefox мүмкіндігін барынша пайдалану туралы кеңестер алыңыз.</string>
@@ -369,6 +356,9 @@
     <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Firefox іздеу виджетін қолданып көру</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Негізгі экрандағы Firefox көмегімен сайтаралық трекерлерді блоктайтын бірінші жекелік браузеріне оңай қол жеткізе аласыз.</string>
     <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Firefox виджетін қосу</string>
@@ -512,11 +502,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Қолжетерлілік</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Таңдауыңызша Firefox тіркелгісі сервері</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Таңдауыңызша Firefox тіркелгісі сервері</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Таңдауыңызша Mozilla тіркелгі сервері</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Таңдауыңызша синхрондау сервері</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox тіркелгісі/синхрондау сервері өзгертілген. Өзгерістерді іске асыру үшін қолданба жұмысын аяқтау…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox тіркелгісі/синхрондау сервері өзгертілген. Өзгерістерді іске асыру үшін қолданба жұмысын аяқтау…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla тіркелгісі/синхрондау сервері өзгертілген. Өзгерістерді іске асыру үшін қолданба жұмысын аяқтау…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Тіркелгі</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -532,7 +526,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Беттер, бетбелгілер, парольдерді синхрондау және т.б. үшін кіріңіз.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox тіркелгісі</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox тіркелгісі</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Синхрондауды жалғастыру үшін қайта байланысыңыз</string>
     <!-- Preference for language -->
@@ -544,7 +540,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB арқылы қашықтан жөндеу</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Іздеу жүйелерін көрсету</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Іздеу жүйелерін көрсету</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 -->
@@ -563,6 +559,16 @@
     <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 -->
@@ -662,9 +668,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Қосымшаға қолдау жоқ</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Қосымшаға қолдау жоқ</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Қосымша орнатылған болып тұр</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Қосымша орнатылған болып тұр</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Қосымшалар уақытша сөндірілген</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Бір немесе бірнеше қосымша жұмысын тоқтатып, жүйені тұрақсыз етті. %1$s қосымша(лар)ды қайта іске қосуды талабын сәтсіз жасады.\n\nҚосымшалар ағымдағы сеанс кезінде қайта іске қосылмайды.\n\nҚосымшаларды өшіру немесе сөндіру бұл мәселені шешуі мүмкін.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Қосымшаларды қайта іске қосып көру</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Сөндірілген кеңейтулермен жалғастыру</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -680,6 +697,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Тіркелгіні басқару</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Пароліңізді өзгерту, деректер жинағын басқару немесе тіркелгіңізді өшіру</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Қазір синхрондау</string>
     <!-- Preference category for sync -->
@@ -1934,7 +1953,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Қосу</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Сақтау</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Сақтау</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Түзету</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2183,7 +2202,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Пікірлерді тексеру құралы</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Пікірлерді тексеру құралы</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Пікірлерді тексеру</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Сенімді пікірлер</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2196,12 +2217,52 @@
     <string name="review_quality_check_adjusted_rating_title">Түзетілген рейтинг</string>
     <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
     <string name="review_quality_check_adjusted_rating_description">Сенімсіз пікірлер өшірілді</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Соңғы пікірлердің маңызды сәттері</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Біз пікірлер сапасын қалай анықтаймыз</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Біз өнім пікірлерінің сенімділігін тексеру үшін Mozilla ұсынған %s AI технологиясын қолданамыз. Бұл өнім сапасын емес, пікір сапасын бағалауға көмектеседі. </string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Әрбір өнім пікіріне біз A мен F арасындағы <b>әріптік баға</b> береміз.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Сенімді пікірлер. Бұл пікірлерді шын, бейтарап пікірлер қалдырған шынайы тұтынушылар жазған деп санаймыз.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Пікірлер сенімді деп есептейміз.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Осында сенімді және сенімсіз пікірлер араласқан деп санаймыз.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Сенімсіз пікірлер. Бұл пікірлер жалған немесе біржақты шолушылар қалдырды деп санаймыз.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Пікірлер сенімсіз деп есептейміз.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Түзетілген рейтинг</b> тек біз сенімді деп есептейтін пікірлерге негізделген.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Маңызды сәттер</b> %s ішінен соңғы 80 күнде алынған, біз сенімді деп ойлайтын пікірлер негізінде алынды.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s туралы көбірек білу.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">Mozilla ұсынған %s пікірлер сапасын қалай анықтайды</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Баптаулар</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Пікірлерді тексеру құралында жарнаманы көрсету</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Сәйкес өнімдерге арналған жарнамаларды анда-санда көретін боласыз. Барлық жарнамалар біздің пікір сапа стандарттарына сай болуы керек. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Сәйкес өнімдерге арналған кездейсоқ жарнамаларды көресіз. Біз тек сенімді пікірлері бар өнімдерді жарнамалаймыз. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Көбірек білу</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Пікірлерді тексеру құралын сөндіру</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Көбірек қарастыру үшін</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">%s ұсынған жарнама</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Пікірлерді тексеру құралы %s негізінде жасалған.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Пікірлерді тексеру құралы %s негізінде жасалған</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">Mozilla ұсынған %s</string>
     <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
@@ -2209,28 +2270,88 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Қазір тексеру</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Пікірлер әлі жеткіліксіз</string>
+    <string name="review_quality_check_no_reviews_warning_title">Пікірлер әлі жеткіліксіз</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Бұл өнімде көбірек пікірлер болған кезде, біз олардың сапасын тексере аламыз.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Бұл өнімде көбірек пікірлер болған кезде, біз олардың сапасын тексере аламыз.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Өнім қолжетімді емес</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Бұл өнімнің қоймаға қайта оралғанын көрсеңіз, оны бізге хабарлаңыз, біз пікірлерді тексереміз.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Бұл өнімнің қоймаға оралғанын хабарлау</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Өнімнің қоймада бар болғанын хабарлау</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Пікір сапасын тексеру</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Пікір сапасын тексеру</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Бұл шамамен 60 секундқа созылуы мүмкін.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Хабарламаңыз үшін рахмет!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Бізде осы өнімнің пікірлері туралы ақпарат 24 сағат ішінде болуы керек. Кейінірек қайта тексеріңіз.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Біз бұл пікірлерді тексере алмаймыз</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Өкінішке орай, біз белгілі бір өнім түрлерінің пікірлер сапасын тексере алмаймыз. Мысалы, сыйлық карталары және ағынды видео, музыка және ойындар.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Ақпарат жақында пайда болады</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Бізде осы өнімнің пікірлері туралы ақпарат 24 сағат ішінде болуы керек. Кейінірек қайта тексеріңіз.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Анализ ескірмеген</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Түсіндім</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Дәл қазір ақпарат жоқ</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Біз мәселені шешу үшін жұмыс істеп жатырмыз. Жақында қайта тексеріңіз.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Желілік байланыс жоқ</string>
+    <string name="review_quality_check_no_connection_title">Желілік байланыс жоқ</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Желілік байланысты тексеріп, бетті қайта жүктеп көріңіз.</string>
+    <string name="review_quality_check_no_connection_body">Желілік байланысты тексеріп, бетті қайта жүктеп көріңіз.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Бұл пікірлер туралы ақпарат әлі жоқ</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Бұл өнім туралы пікірлер сенімді екенін білу үшін пікірлер сапасын тексеріңіз. Ол небәрі 60 секундты алады.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Пікір сапасын тексеру</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Өнім пікірлерінің сенімділігі туралы біздің нұсқаулықты қолданып көріңіз</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Сатып алғанға дейін %1$s сайтындағы өнім пікірлері қаншалықты сенімді екенін қараңыз. Пікірлерді тексеру құралын %2$s сынамалы түрде ұсынады, ол тура браузер ішінде қолжетімді — сонымен қатар, ол %3$s және %4$s сайттарында да істейді.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Mozilla ұсынған %1$s мүмкіндігін пайдалана отырып, біз сізге біржақты және шынайы емес пікірлерден аулақ болуға көмектесеміз. Сатып алу кезінде сізді қорғау үшін біздің AI моделіміз үнемі жетілдіріліп отырады. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Көбірек білу</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">&quot;Иә, қолданып көру&quot; опциясын таңдау арқылы сіз Mozilla ұсынған %1$s қолданбасының %2$s және %3$s шарттарымен келісесіз.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">жекелік саясаты</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">қолдану шарттары</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">Иә, қолданып көру</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Қазір емес</string>
 
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Сатып алғанға дейін осы өнім туралы пікірлерге сене аласыз ба, соны біліңіз.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Пікірлерді тексеру құралын қолданып көру</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Бұл пікірлер сенімді ме? Түзетілген рейтингті көру үшін қазір тексеріңіз.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Пікірлерді тексеру құралын ашу</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Бета</string>
+    <string name="review_quality_check_beta_flag">Бета</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Пікірлерді тексеру құралын ашу</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Пікірлерді тексеру құралын жабу</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s жұлдыз, 5 ішінен</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">Азырақ көрсету</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
@@ -2240,6 +2361,13 @@
     <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
     <string name="review_quality_check_highlights_type_price">Бағасы</string>
 
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Жеткізілім</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Қаптама және сыртқы түрі</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Бәсекеге қабілеттілік</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">бүктеу</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 7ec3cc5ff..de83ba515 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -331,16 +331,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">나중에</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s를 기본 브라우저로 설정해 보세요</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox를 기본 브라우저로 설정해 보세요</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s는 이익보다 사람을 우선시하고 교차 사이트 추적기를 차단하여 개인 정보를 보호합니다.\n\n%2$s에서 더 알아보세요.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox는 이익보다 사람을 우선시하고 교차 사이트 추적기를 차단하여 개인 정보를 보호합니다.\n\n개인정보처리방침에서 더 알아보세요.</string>
@@ -359,15 +352,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">로그인</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">나중에</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">알림은 %s로 더 많은 작업을 수행하는 데 도움이 됩니다</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">알림은 Firefox로 더 많은 작업을 수행하는 데 도움이 됩니다</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">기기 간에 탭을 보내고, 다운로드를 관리하고, %s를 최대한 활용하기 위한 팁을 얻으세요.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">기기 간에 탭을 보내고, 다운로드를 관리하고, Firefox를 최대한 활용하기 위한 팁을 얻으세요.</string>
@@ -521,15 +508,19 @@
     <!-- 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>
+    <string name="errorpage_httpsonly_message_summary">그러나, 공격자가 연루되었을 가능성도 있습니다. 웹 사이트를 방문하는 경우, 민감한 정보는 입력하지 않아야 합니다. 계속하면, 사이트에 대해 HTTPS 전용 모드가 일시적으로 꺼집니다.</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">접근성</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">사용자 지정 Firefox 계정 서버</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">사용자 지정 Firefox 계정 서버</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">사용자 지정  Mozilla 계정 서버</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">사용자 지정 동기화 서버</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox 계정/동기화 서버가 변경되었습니다. 변경 사항을 적용하기 위해 애플리케이션을 종료하는 중…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox 계정/동기화 서버가 변경되었습니다. 변경 사항을 적용하기 위해 애플리케이션을 종료하는 중…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla 계정/동기화 서버가 수정되었습니다. 변경사항을 적용하기 위해 애플리케이션을 종료하는 중…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">계정</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -545,7 +536,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">탭, 북마크, 비밀번호 등을 동기화하려면 로그인하세요.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox 계정</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox 계정</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">다시 연결하여 동기화를 계속하세요</string>
     <!-- Preference for language -->
@@ -557,7 +550,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB 원격 디버깅</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">검색 엔진 표시</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">검색 엔진 표시</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 -->
@@ -577,6 +570,16 @@
 
     <!-- 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>
 
@@ -678,9 +681,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">부가 기능이 지원되지 않음</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">부가 기능이 지원되지 않음</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">부가 기능이 이미 설치됨</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">부가 기능이 이미 설치됨</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">부가 기능이 일시적으로 비활성화됨</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">하나 이상의 부가 기능이 작동을 중지하여 시스템이 불안정해졌습니다. %1$s가 부가 기능을 다시 시작하지 못했습니다.\n\n현재 세션 중에는 부가 기능이 다시 시작되지 않습니다.\n\n부가 기능을 제거하거나 비활성화하면 이 문제가 해결될 수도 있습니다.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">부가 기능을 다시 시작해 보기</string>
+
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">부가 기능을 비활성화하고 계속</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -696,6 +710,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">계정 관리</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">비밀번호 변경, 데이터 수집 관리 또는 계정 삭제</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">지금 동기화</string>
     <!-- Preference category for sync -->
@@ -1989,7 +2005,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">추가</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">저장</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">저장</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">편집</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2241,7 +2257,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">리뷰 검사기</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">리뷰 검사기</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">리뷰 검사기</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">신뢰할 수 있는 리뷰</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2261,17 +2279,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Mozilla의 %s AI 기술을 사용하여 제품 리뷰의 신뢰성을 확인합니다. 이는 제품 품질이 아닌 리뷰 품질을 평가하는 데에만 도움이 됩니다.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[각 제품의 리뷰에는 A부터 F까지 <b>문자 등급</b>이 부여됩니다.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[각 제품의 리뷰에는 A부터 F까지 <b>문자 등급</b>이 부여됩니다.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">신뢰할 수 있는 리뷰. 솔직하고 공정한 리뷰를 남긴 실제 고객의 리뷰일 가능성이 높다고 생각합니다.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">신뢰할 수 있는 리뷰라고 생각합니다.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">신뢰할 수 있는 리뷰와 신뢰할 수 없는 리뷰가 혼합되어 있다고 생각합니다.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">신뢰할 수 없는 리뷰. 리뷰가 가짜이거나 편향된 리뷰어의 리뷰일 가능성이 있다고 생각합니다.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">신뢰할 수 없는 리뷰라고 생각합니다.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>조정된 평점</b>은 신뢰할 수 있다고 믿는 리뷰만을 기반으로 합니다.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>하이라이트</b>는 지난 80일 동안 신뢰할 수 있는 %s의 리뷰에서 나온 것입니다.]]></string>
+    <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. -->
@@ -2281,7 +2303,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">리뷰 검사기에 광고 표시</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">관련 제품에 대한 광고가 가끔 표시됩니다. 모든 광고는 리뷰 품질 기준을 충족해야 합니다. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">관련 제품에 대한 광고가 가끔 표시됩니다. 모든 광고는 리뷰 품질 기준을 충족해야 합니다. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">관련 제품에 대한 광고가 가끔 표시됩니다. 믿을 수 있는 리뷰가 있는 제품만을 광고합니다. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">더 알아보기</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2301,29 +2325,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">지금 확인</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">아직 리뷰가 충분하지 않음</string>
+    <string name="review_quality_check_no_reviews_warning_title">아직 리뷰가 충분하지 않음</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">이 제품에 대한 리뷰가 더 많아지면 품질을 확인할 수 있을 것입니다.</string>
+    <string name="review_quality_check_no_reviews_warning_body">이 제품에 대한 리뷰가 더 많아지면 품질을 확인할 수 있을 것입니다.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">제품을 사용할 수 없음</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">이 제품이 재입고된 것을 확인하시면, 보고해 주시면 리뷰를 확인하도록 하겠습니다.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">이 제품이 재입고되었다고 보고</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">이 제품이 재입고되었다고 보고</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">제품 재고가 있다고 보고</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">리뷰 품질 확인 중</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">리뷰 품질 확인 중</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">리뷰 품질 확인 중</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">리뷰 품질 확인 중</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">이 작업은 약 60초 정도 걸릴 수 있습니다.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">이 작업은 약 60초 정도 걸릴 수 있습니다.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">보고해 주셔서 감사합니다!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">24시간 이내에 이 제품의 리뷰에 대한 정보를 받아야 합니다. 다시 확인해 주세요.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">리뷰를 확인할 수 없음</string>
+    <string name="review_quality_check_not_analyzable_info_title">리뷰를 확인할 수 없음</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">안타깝게도 특정 유형의 제품에 대해서는 리뷰 품질을 확인할 수 없습니다. 예를 들어 기프트 카드, 스트리밍 동영상, 음악, 게임 등이 있습니다.</string>
+    <string name="review_quality_check_not_analyzable_info_body">안타깝게도 특정 유형의 제품에 대해서는 리뷰 품질을 확인할 수 없습니다. 예를 들어 기프트 카드, 스트리밍 동영상, 음악, 게임 등이 있습니다.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">곧 정보 제공 예정</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2333,19 +2359,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">확인</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">현재 사용 가능한 정보가 없음</string>
+    <string name="review_quality_check_generic_error_title">현재 사용 가능한 정보가 없음</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">문제를 해결하기 위해 노력하고 있습니다. 곧 다시 확인하시기 바랍니다.</string>
+    <string name="review_quality_check_generic_error_body">문제를 해결하기 위해 노력하고 있습니다. 곧 다시 확인하시기 바랍니다.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">네트워크 연결 없음</string>
+    <string name="review_quality_check_no_connection_title">네트워크 연결 없음</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">네트워크 연결을 확인한 후 페이지를 새로 고침해 보세요.</string>
+    <string name="review_quality_check_no_connection_body">네트워크 연결을 확인한 후 페이지를 새로 고침해 보세요.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">이 리뷰에 대한 정보가 아직 없음</string>
+    <string name="review_quality_check_no_analysis_title">이 리뷰에 대한 정보가 아직 없음</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">이 제품의 리뷰가 신뢰할 수 있는지 확인하려면 리뷰 품질을 확인하세요. 약 60초밖에 걸리지 않습니다.</string>
+    <string name="review_quality_check_no_analysis_body">이 제품의 리뷰가 신뢰할 수 있는지 확인하려면 리뷰 품질을 확인하세요. 약 60초밖에 걸리지 않습니다.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">리뷰 품질 확인</string>
+    <string name="review_quality_check_no_analysis_link">리뷰 품질 확인</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">제품 리뷰에 대한 신뢰할 수 있는 가이드를 사용해 보세요</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2359,7 +2385,7 @@
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">개인정보처리방침</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
-    <string name="review_quality_check_contextual_onboarding_terms_use">이용 약관</string>
+    <string name="review_quality_check_contextual_onboarding_terms_use">사용 약관</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_primary_button_text">사용해보기</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
@@ -2373,12 +2399,12 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">리뷰 검사기 열기</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
 
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">리뷰 품질 확인 열기</string>
+    <string name="review_quality_check_open_handle_content_description">리뷰 검사기 열기</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">리뷰 품질 확인 닫기</string>
+    <string name="review_quality_check_close_handle_content_description">리뷰 검사기 닫기</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">별 5개 중 %1$s개</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 14518f397..5f0b1734c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -23,6 +23,14 @@
     <color name="fx_mobile_layer_color_gradient_start">@color/photonViolet70</color>
     <!-- Tooltip -->
     <color name="fx_mobile_layer_color_gradient_end">@color/photonViolet40</color>
+    <!-- Warning background -->
+    <color name="fx_mobile_layer_color_warning" tools:ignore="UnusedResources">@color/photonYellow70A77</color>
+    <!-- Confirmation background -->
+    <color name="fx_mobile_layer_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen80</color>
+    <!-- Error background -->
+    <color name="fx_mobile_layer_color_error" tools:ignore="UnusedResources">@color/photonPink80</color>
+    <!-- Info background -->
+    <color name="fx_mobile_layer_color_info" tools:ignore="UnusedResources">@color/photonBlue50A80</color>
 
     <!-- Action -->
     <!-- Primary button, Snackbar, Floating action button, Chip selected -->
@@ -32,7 +40,15 @@
     <!-- Filter -->
     <color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color>
     <!-- Chip -->
-    <color name="fx_mobile_action_quarternary" tools:ignore="UnusedResources">@color/photonDarkGrey80</color>
+    <color name="fx_mobile_action_color_quarternary" tools:ignore="UnusedResources">@color/photonDarkGrey80</color>
+    <!-- Warning button -->
+    <color name="fx_mobile_action_color_warning" tools:ignore="UnusedResources">@color/photonYellow40A41</color>
+    <!-- Confirmation button -->
+    <color name="fx_mobile_action_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen70</color>
+    <!-- Error button -->
+    <color name="fx_mobile_action_color_error" tools:ignore="UnusedResources">@color/photonPink70A69</color>
+    <!-- Info button -->
+    <color name="fx_mobile_action_color_info" tools:ignore="UnusedResources">@color/photonBlue30</color>
     <!-- Checkbox default, Radio button default -->
     <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
     <!-- Checkbox selected, Radio button selected -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3d069fada..cbe752d8b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -330,16 +330,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Niet nu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Maak %s uw ‘ga naar’-browser</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Maak Firefox uw ‘ga naar’-browser</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s plaatst mensen boven winst en verdedigt uw privacy door cross-sitetrackers te blokkeren.\n\nMeer info in onze %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox plaatst mensen boven winst en verdedigt uw privacy door cross-sitetrackers te blokkeren.\n\nMeer info in onze privacyverklaring.</string>
@@ -358,15 +351,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Aanmelden</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Niet nu</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Meldingen helpen u meer te doen met %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Meldingen helpen u meer te doen met Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Verzend tabbladen tussen apparaten, beheer downloads en ontvang tips om %s optimaal te benutten.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Verzend tabbladen tussen apparaten, beheer downloads en ontvang tips om Firefox optimaal te benutten.</string>
@@ -520,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Toegankelijkheid</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Aangepaste Firefox Accountserver</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Aangepaste Firefox Accountserver</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Aangepaste Mozilla-accountserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Aangepaste Syncserver</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox Account-/Syncserver aangepast. Toepassing wordt afgesloten om wijzigingen toe te passen…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Account-/Syncserver aangepast. Toepassing wordt afgesloten om wijzigingen toe te passen…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-account-/Synchronisatieserver aangepast. Toepassing wordt afgesloten om wijzigingen toe te passen…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Account</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -540,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Meld u aan om uw tabbladen, bladwijzers, wachtwoorden en meer te synchroniseren.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-account</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-account</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-account</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Verbind opnieuw om de synchronisatie te hervatten</string>
     <!-- Preference for language -->
@@ -552,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Zoekmachines tonen</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Zoekmachines tonen</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Zoeksuggesties tonen</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -572,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">URL’s automatisch aanvullen</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggesties van sponsors</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">Ondersteun %1$s met af en toe gesponsorde suggesties</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">Suggesties van %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Ontvang suggesties van het web gerelateerd aan uw zoekopdracht</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Koppelingen openen in apps</string>
 
@@ -673,9 +676,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Add-on wordt niet ondersteund</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Add-on wordt niet ondersteund</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Add-on is al geïnstalleerd</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Add-on is al geïnstalleerd</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Add-ons zijn tijdelijk uitgeschakeld</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Een of meer add-ons werken niet meer, waardoor uw systeem instabiel wordt. %1$s heeft tevergeefs geprobeerd de add-on(s) opnieuw te starten.\n\nAdd-ons zullen tijdens uw huidige sessie niet opnieuw worden gestart.\n\nHet verwijderen of uitschakelen van add-ons kan dit probleem oplossen.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Probeer add-ons opnieuw te starten</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Doorgaan met uitgeschakelde add-ons</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -691,6 +705,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Account beheren</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Uw wachtwoord wijzigen, gegevensverzameling beheren of uw account verwijderen</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Nu synchroniseren</string>
     <!-- Preference category for sync -->
@@ -1947,7 +1963,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Toevoegen</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Opslaan</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Opslaan</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Bewerken</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2197,7 +2213,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Beoordelingscontrole</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Beoordelingscontrole</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Beoordelingscontrole</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Betrouwbare beoordelingen</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2217,17 +2235,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">We gebruiken AI-technologie van %s door Mozilla om de betrouwbaarheid van productbeoordelingen te analyseren. Hiermee kunt u alleen de kwaliteit van beoordelingen vaststellen, niet de productkwaliteit.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[We kennen aan de beoordelingen van elk product een <b>letterwaarde</b> toe, van A tot F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[We kennen aan de beoordelingen van elk product een <b>letterwaarde</b> toe, van A tot F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Betrouwbare beoordelingen. Wij zijn van mening dat de beoordelingen waarschijnlijk afkomstig zijn van echte klanten die eerlijke, onpartijdige beoordelingen hebben achtergelaten.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wij denken dat de beoordelingen betrouwbaar zijn.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Wij geloven dat er een mix is van betrouwbare en onbetrouwbare beoordelingen.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Onbetrouwbare beoordelingen. Wij zijn van mening dat de beoordelingen waarschijnlijk nep zijn of afkomstig zijn van bevooroordeelde beoordelaars.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Wij denken dat de beoordelingen niet betrouwbaar zijn.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[De <b>aangepaste waardering</b> is alleen gebaseerd op beoordelingen die wij betrouwbaar achten.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Hoogtepunten</b> zijn afkomstig van beoordelingen van %s in de afgelopen 80 dagen die volgens ons betrouwbaar zijn.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Hoogtepunten</b> zijn afkomstig van beoordelingen van %s in de afgelopen 80 dagen die volgens ons betrouwbaar zijn.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Meer info over %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2237,7 +2259,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Advertenties tonen in beoordelingscontrole</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">U ziet af en toe advertenties voor relevante producten. Alle advertenties moeten voldoen aan onze kwaliteitsnormen voor beoordelingen. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">U ziet af en toe advertenties voor relevante producten. Alle advertenties moeten voldoen aan onze kwaliteitsnormen voor beoordelingen. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">U ziet af en toe advertenties voor relevante producten. We adverteren alleen voor producten met betrouwbare beoordelingen. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Meer info</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2257,29 +2281,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Nu controleren</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Nog niet genoeg beoordelingen</string>
+    <string name="review_quality_check_no_reviews_warning_title">Nog niet genoeg beoordelingen</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Wanneer dit product meer beoordelingen heeft, kunnen we hun kwaliteit beoordelen.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Wanneer dit product meer beoordelingen heeft, kunnen we hun kwaliteit beoordelen.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Product is niet beschikbaar</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Als u ziet dat dit product weer op voorraad is, meld dit dan aan ons en wij zullen eraan werken om de beoordelingen te controleren.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Melden dat dit product weer op voorraad is</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Melden dat dit product weer op voorraad is</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Rapporteren dat product op voorraad is</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Beoordelingskwaliteit controleren</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Beoordelingskwaliteit controleren</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Beoordelingskwaliteit controleren</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Beoordelingskwaliteit controleren</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Dit kan ongeveer 60 seconden duren.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Dit kan ongeveer 60 seconden duren.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Bedankt voor het melden!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">We zouden binnen 24 uur info over de beoordelingen van dit product moeten hebben. Kom later nog eens terug.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">We kunnen deze beoordelingen niet controleren</string>
+    <string name="review_quality_check_not_analyzable_info_title">We kunnen deze beoordelingen niet controleren</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Helaas kunnen we de beoordelingskwaliteit voor bepaalde soorten producten niet controleren. Dit betreft bijvoorbeeld cadeaubonnen en streaming video, muziek en games.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Helaas kunnen we de beoordelingskwaliteit voor bepaalde soorten producten niet controleren. Dit betreft bijvoorbeeld cadeaubonnen en streaming video, muziek en games.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Binnenkort info</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2289,19 +2315,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Begrepen</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Er is momenteel geen info beschikbaar</string>
+    <string name="review_quality_check_generic_error_title">Er is momenteel geen info beschikbaar</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">We werken eraan om het probleem op te lossen. Kom binnenkort nog eens terug.</string>
+    <string name="review_quality_check_generic_error_body">We werken eraan om het probleem op te lossen. Kom binnenkort nog eens terug.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Geen netwerkverbinding</string>
+    <string name="review_quality_check_no_connection_title">Geen netwerkverbinding</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Controleer uw netwerkverbinding en probeer vervolgens de pagina opnieuw te laden.</string>
+    <string name="review_quality_check_no_connection_body">Controleer uw netwerkverbinding en probeer vervolgens de pagina opnieuw te laden.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Nog geen info over deze beoordelingen</string>
+    <string name="review_quality_check_no_analysis_title">Nog geen info over deze beoordelingen</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Controleer de beoordelingskwaliteit om te ontdekken of de beoordelingen van dit product betrouwbaar zijn. Het duurt slechts ongeveer 60 seconden.</string>
+    <string name="review_quality_check_no_analysis_body">Controleer de beoordelingskwaliteit om te ontdekken of de beoordelingen van dit product betrouwbaar zijn. Het duurt slechts ongeveer 60 seconden.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Beoordelingskwaliteit controleren</string>
+    <string name="review_quality_check_no_analysis_link">Beoordelingskwaliteit controleren</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Probeer onze vertrouwde gids voor productbeoordelingen</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2331,11 +2357,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Beoordelingscontrole openen</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Beoordelingskwaliteitscontrole openen</string>
+    <string name="review_quality_check_open_handle_content_description">Beoordelingscontrole openen</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Beoordelingskwaliteitscontrole sluiten</string>
+    <string name="review_quality_check_close_handle_content_description">Beoordelingscontrole sluiten</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s van 5 sterren</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 0879cb0f8..0b13b5f02 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -72,6 +72,16 @@
     <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
     <string name="felt_privacy_desc_card_title">Etterlèt ingen spor på denne eininga</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">%1$s slettar alle infokaspslar, historikk og nettstaddata når du lèt att alle private vindauge. %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">Kven kan kanskje sjå aktiviteten min?</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">Opne neste private fane med eitt trykk.</string>
@@ -96,6 +106,11 @@
     <string name="tcp_cfr_learn_more">Les meir om totalt vern mot infokapslar</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">Trykk her for å starte ei ny privat økt. Slett historikken din, infokapslar — alt.</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">Kameratilgang er nødvendig. Gå til Android-innstillingar, trykk på løyve, og trykk på tillat.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -313,16 +328,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ikkje no</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Bruk %s som favorittnettlesar</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Bruk Firefox som din faforittnettlesar</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s set menneske over forteneste og forsvarar retten din til personvern ved å blokkere sporarar på fleire nettstadar.\n\nLes meir i %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox set menneske over forteneste og forsvarar retten din til personvern ved å blokkere sporarar på fleire nettstadar.\n\nLes meir i personvernerklæringa vår.</string>
@@ -341,15 +349,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Logg inn</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ikkje no</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Varsel hjelper deg å gjere meir med %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Varsel hjelper deg å gjere meir med Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Send faner mellom einingar, administrer nedlastingar og få tips om korleis du får mest muleg ut av %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Send faner mellom einingar, administrer nedlastingar og få tips om korleis du får mest muleg ut av Firefox.</string>
@@ -503,11 +505,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Tilgjenge</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Tilpassa server for Firefox-konto</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Tilpassa server for Firefox-konto</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Tilpassa Mozilla-kontoserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Tilpassa synkroniseringsserver</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox-konto/synkroniseringsserver endra. Avsluttar applikasjonen for å bruke endringar…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto/synkroniseringsserver endra. Avsluttar applikasjonen for å bruke endringar…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-konto/synkroniseringsserver er endra. Avsluttar programmet for å kunne bruke endringane…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
 
@@ -524,7 +530,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Logg inn for å synkronisere faner, bokmerke, passord med meir.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-konto</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-konto</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Kople til igjen for å halde fram synkroniseringa</string>
     <!-- Preference for language -->
@@ -556,6 +564,16 @@
     <string name="preferences_account_settings">Kontoinnstillingar</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autofullfør nettadresser</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Forslag frå sponsorar</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">Stø %1$s med enkelte sponsa forslag</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">Forslag frå %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Få forslag frå nettet relatert til søkinga di</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Opne lenker i appar</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -2216,19 +2234,31 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Vi nyttar AI-teknologi frå %s frå Mozilla for å kontrollere pålitelegheita av produktvurderingar. Dette vil berre hjelpe deg med å fastsetje vurderingskvaliteten, ikkje produktkvaliteten. </string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Vi gir vurderingane til kvart produkt ein <b>bokstavkarakter</b> frå A til F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Vi gir vurderingane til kvart produkt ein <b>bokstavkarakter</b> frå A til F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Pålitelege vurderingar. Vi meinar at vureringane truleg kjem frå ekte kundar som har lagt att ærlege, upartiske vurderingar.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi meiner at vurderingane er til å stole på.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Vi meinar at det finst ei blanding av pålitelege og upålitelege vurderingar.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Upålitelege vurderingar. Vi meinar at vurderingane sannsynlegvis er falske, eller frå partiske kritikarar.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi meiner at vurderingane ikkje er til å stole på.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Den <b>justerte vurderinga</b> er berre basert på vurderingar vi meiner er pålitelege.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Høgdepunkt</b> er frå %s vurderingar dei siste 80 dagane som vi meiner er pålitelege.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Les meir om %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">korleis %s frå Mozilla bestemmer kvaliteten på ei vurdering</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Innstillingar</string>
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Vis annonsar i vurderingskontrolløren</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Du vil av og til sjå annonsar for relevante produkt. Alle annonsar må oppfylle kvalitetsstandardane våre for vurderingar. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Les meir</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2248,33 +2278,61 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Kontroller no</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ikkje nok vurderingar enno</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ikkje nok vurderingar enno</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Når dette produktet har fleire vurderingar, kan vi sjekke kvaliteten.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produktet er ikkje tilgjengeleg</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Om du ser at dette produktet er tilbake på lager, rapporter det, så jobbar vi med å kontrollere vurderingane.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Rapporter at dette produktet er tilbake på lager</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrollerer kvaliteten på vurderinga</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontrollerer kvaliteten på vurderinga</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrollerer kvaliteten på vurderinga</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontrollerer kvaliteten på vurderinga</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Dette vil ta omlag 60 sekund.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Dette vil ta omlag 60 sekund.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Takk for at du rapporterer!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Vi bør ha informasjon om vurderingane til dette produktet innan 24 timar. Sjekk igjen litt seinare.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Vi klarer ikkje å kontrollere desse vurderingane</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Diverre kan vi ikkje kontrollere produktkvaliteten på enkelte produkttypar, som til dømes gåvekort, strøyme-video, musikk og spel.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Info kjem snart</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Vi bør ha informasjon om vurderingane til dette produktet innan 24 timar. Sjekk igjen litt seinare.</string>
     <!-- Title for info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analysen er oppdatert</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Eg forstår</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Ingen informasjon tilgjengeleg akkurat no</string>
+    <string name="review_quality_check_generic_error_title">Ingen informasjon tilgjengeleg akkurat no</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Vi jobbar med å løyse problemet. Prøv på nytt, snart.</string>
+    <string name="review_quality_check_generic_error_body">Vi jobbar med å løyse problemet. Prøv på nytt, snart.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Inga nettverkstilkopling</string>
+    <string name="review_quality_check_no_connection_title">Inga nettverkstilkopling</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Kontroller nettverkstilkoplinga di, og oppdater deretter sida.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Ingen informasjon om desse vurderingane enno</string>
+    <string name="review_quality_check_no_analysis_title">Ingen informasjon om desse vurderingane enno</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">For å vite om vurderingane av dette produktet er pålitelege, kontroller kvaliteten på vurderinga. Det tek berre omlag 60 sekund.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Kontroller kvaliteten på vurderinga</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Prøv den pålitelege guiden vår for produktvurderingar</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Sjå kor påliteleg produktvurderingar er på %1$s før du kjøper. Vurderingskontrolløren, ein eksperimentell funksjon frå %2$s, er direkte inbyggd i nettlesaren. Han fungerer på %3$s og på %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Med krafta i %1$s frå Mozilla hjelper vi deg med å unngå einsidige og ikkje-truverdige vurderingar. AI-modellen vår vert alltid forbetra for å beskytte deg når du handlar. %2$s</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Les meir</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Ved å velje «Ja, prøv det» seier du deg samd i %1$s av Mozillas %2$s og %3$s.</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">personvernpraksis</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2283,10 +2341,20 @@
     <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. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ikkje no</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Finn ut om du kan stole på vurderingane av dette produktet — før du kjøper.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Prøv vurderingskontrolløren</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Er desse vurderingane pålitelege? Sjekk no for å sjå ei justert vurdering.</string>
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Opne vurderingskontrolløren</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Opne vurderingskontrolløren</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Lat att vurderingskontrolløren</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s av 5 stjerner</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index a58d3f407..26b5d1bb6 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -64,6 +64,19 @@
     <string name="private_browsing_placeholder_description_2">%1$s escafa vòstre istoric de recèrcas e de navegacion quand quitatz l’aplicacion o tampatz totes los onglets e fenèstras de navegacion privada. Malgrat qu’aquò vos faga pas venir anonim pels sites web o vòstre provesidor Internet, fa venir mai simple de gardar privat çò que fasètz en linha pels autres qu’utilizan aqueste aparelh.</string>
     <string name="private_browsing_common_myths">Mites màgers de la navegacion privada</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Daissatz pas cap de traça sus aqueste aparelh</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">%1$s suprimís los cookies, l’istoric e las donadas de sites quand tampatz totas las fenèstras privadas. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Qual pòt veire activitat ?</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">Lançar vòstre onglet privat venent d’una tòca.</string>
@@ -86,6 +99,12 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Ne saber tocant la proteccion totala contra los cookies</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">Tocatz aicí per començar una session privada freja. Suprimirà l’istoric, los cookies — tot.</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">Accès a la camèra necessari. Anatz als paramètres Android, tocatz Autorizacions puèi Autorizar.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -224,6 +243,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Ecran d’acuèlh</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">Netejar l’istoric de navegacion</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lenga seleccionada</string>
@@ -301,16 +323,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Mai tard</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Far de %s vòstre navegador per defaut</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Far de Firefox vòstre navegador per defaut</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s considèra la gent abans l’argent e defend vòstra vida privada en blocant los traçadors intersites.\n\nAprenètz-ne mai dins nòstre %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox considèra la gent abans l’argent e defend vòstra vida privada en blocant los traçadors intersites.\n\nAprenètz-ne mai dins nòstre nòta sus la confidencialitat.</string>
@@ -329,15 +344,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Connexion</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Pas ara</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Las notificacions vos ajudan a ne far mai amb %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Las notificacions vos ajudan a ne far mai amb Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Enviatz los onglets d’un aparelh a l’autre, gerissètz los telecargaments e obtenètz de conselhs per ne far encara mai amb %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Enviatz los onglets d’un aparelh a l’autre, gerissètz los telecargaments e obtenètz de conselhs per ne far encara mai amb Firefox.</string>
@@ -346,6 +355,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Mai tard</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Ensajar lo widget de recèrca Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Amb Firefox per l’ecran d’acuèlh auretz accès facilament al navegador dedicat a la vida privada que bloca los traçadors intersites.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Apondre lo widget Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Pas ara</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">Dobrir dins un onglet %1$s novèl</string>
@@ -482,11 +503,13 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibilitat</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor de compte Firefox personalizat</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de compte Firefox personalizat</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor de compte Mozilla personalizat</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor Sync personalizat</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servidor de compte o de sincronozacion modificat. L’aplicacion se tanca per aplicar las modificacions…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de compte o de sincronozacion modificat. L’aplicacion se tanca per aplicar las modificacions…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Compte</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -502,7 +525,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Connectatz-vos per sincronizar onglets, marcapaginas, senhals e plan mai encara.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Compte Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Compte Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Compte Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Tornatz vos connectar per reprendre la sincronizacion</string>
     <!-- Preference for language -->
@@ -534,6 +559,14 @@
     <string name="preferences_account_settings">Paramètres del compte</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocomplecion URL</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestions d’esponsòrs</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">Sosténer %1$s en afichant ocasionalament de suggestions esponsorizadas</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">Suggestions de %1$s</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Dobrir los ligams dins las aplicacions</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -638,9 +671,17 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Lo modul complementari es pas pres en carga</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Lo modul complementari es pas pres en carga</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Lo modul complementari es ja installat</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Lo modul complementari es ja installat</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Los moduls son temporàriament desactivats</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Relançar los moduls</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Contunhar amb los moduls desactivats</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -1336,6 +1377,8 @@
     <string name="snackbar_private_tab_closed">Onglet privat tampat</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Onglets privats tampats</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Donadas de navegacion privada suprimidas</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ANULLAR</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -2182,6 +2225,83 @@ Exemple :\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Anar als paramètres</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Verificador d’avises</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Avises fisables</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mescladís d’avises fisables e non fisables</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Avises non fisables</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Quina es la fisabilitat d’aquestes avises ?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Evaluacion corregida</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Avises non fisables suprimits</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Coma determinam la qualitat d’un aví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">Per ne saber mai sus %s.</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Paramètres</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Ne saber mai</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Copar lo verificador d’avises</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Produits alternatius</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Publicitat de %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s per Mozilla</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Verificar ara</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Las analisis son a jorn</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Plan realizat</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Cap de connexion ret</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Ne saber mai</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">politica de confidencialitat</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">condicions d’utilizacion</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Òc-ben, ensajar</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Mai tard</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Ensajar lo verificador d’avises</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Dobrir lo verificador d’avises</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Bèta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Dobrir lo verificador d’avises</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Tampar lo verificador d’avises</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s estelas de 5</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Ne veire mens</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Ne veire mai</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Qualitat</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Prètz</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Expedicion</string>
+
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalatge e aparéncia</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitivitat</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">plegar</string>
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index e068db926..8a8dbe103 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -330,16 +330,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">ਹੁਣੇ ਨਹੀਂ</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s ਨੂੰ ਆਪਣਾ ਪੱਕਾ ਬਰਾਊਜ਼ਰ ਬਣਾਓ</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox ਨੂੰ ਆਪਣਾ ਪੱਕਾ ਬਰਾਊਜ਼ਰ ਬਣਾਓ</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ਫ਼ਾਇਦੇ ਤੋਂ ਪਹਿਲਾਂ ਲੋਕਾਂ ਨੂੰ ਰੱਖਦਾ ਹੈ ਅਤੇ ਅੰਤਰ-ਸਾਈਟ ਟਰੈਕਰਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾ ਕੇ ਤੁਹਾਡੀ ਪਰਦੇਦਾਰੀ ਦੀ ਰੱਖਿਆ ਕਰਦਾ ਹੈ।\n\nਸਾਡੇ %2$s ਬਾਰੇ ਹੋਰ ਜਾਣੋ।</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ਫ਼ਾਇਦੇ ਨਾਲੋਂ ਲੋਕਾਂ ਨੂੰ ਪਹਿਲ ਦਿੰਦਾ ਹੈ ਅਤੇ ਅੰਤਰ-ਸਾਈਟ ਟਰੈਕਰਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾ ਕੇ ਤੁਹਾਡੇ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਚਾਉਂਦਾ ਹੈ।\n\nਹੋਰ ਜਾਣਕਾਰੀ ਸਾਡੀ ਪਰਦੇਦਾਰੀ ਸੂਚਨਾ ਨੂੰ ਪੜ੍ਹੋ।</string>
@@ -358,16 +351,10 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">ਸਾਈਨ ਇਨ</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">ਹੁਣੇ ਨਹੀਂ</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">ਨੋਟੀਫ਼ਿਕੇਸ਼ਨ ਤੁਹਾਨੂੰ %s ਨਾਲ ਹੋਰ ਕਰਨ ਦੀ ਮਦਦ ਕਰਦੇ ਹਨ</string>
 
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">ਨੋਟੀਫ਼ਿਕੇਸ਼ਨ ਤੁਹਾਨੂੰ Firefox ਨਾਲ ਵੱਧ ਕੰਮ ਦੀ ਮਦਦ ਕਰਦੇ ਹਨ</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">ਡਿਵਾਈਸਾਂ ਵਿੱਚ ਟੈਬਾਂ ਭੇਜੋ, ਡਾਊਨਲੋਡਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ ਅਤੇ %s ਦਾ ਭਰਪੂਰ ਫ਼ਾਇਦਾ ਲੈਣ ਲਈ ਹੋਰ ਸੁਝਾਅ ਲਵੋ।</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">ਟੈਬਾਂ ਨੂੰ ਡਿਵਾਈਸਾਂ ਵਿਚਾਲੇ ਭੇਜੋ, ਡਾਊਨਲੋਡ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ ਅਤੇ Firefox ਦਾ ਪੂਰਾ ਫ਼ਾਇਦਾ ਲੈਣ ਲਈ ਸੁਝਾਅ ਲਵੋ।</string>
@@ -524,11 +511,16 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">ਅਸੈਸਬਿਲਟੀ</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">ਕਸਟਮ ਫਾਇਰਫਾਕਸ ਖਾਤਾ ਸਰਵਰ</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">ਕਸਟਮ ਫਾਇਰਫਾਕਸ ਖਾਤਾ ਸਰਵਰ</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">ਪਸੰਦੀਦਾ Mozilla ਖਾਤਾ ਸਰਵਰ</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">ਪਸੰਦੀਦਾ ਸਿੰਕ ਸਰਵਰ</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox ਖਾਤਾ/ਸਿੰਕ ਸਰਵਰ ਸੋਧਿਆ ਗਿਆ ਹੈ। ਤਬਦੀਲੀਆਂ ਲਾਗੂ ਕਰਨ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਬਾਹਰ ਜਾਓ…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox ਖਾਤਾ/ਸਿੰਕ ਸਰਵਰ ਸੋਧਿਆ ਗਿਆ ਹੈ। ਤਬਦੀਲੀਆਂ ਲਾਗੂ ਕਰਨ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਬਾਹਰ ਜਾਓ…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla ਖਾਤਾ/ਸਿੰਕ ਸਰਵਰ ਨੂੰ ਸੋਧਿਆ ਗਿਆ ਹੈ।
+ਤਬਦੀਲੀਆਂ ਲਾਗੂ ਕਰਨ ਵਾਸਤੇ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">ਖਾਤਾ</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -544,7 +536,9 @@
     <!-- 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">ਫਾਇਰਫਾਕਸ ਖਾਤਾ</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">ਫਾਇਰਫਾਕਸ ਖਾਤਾ</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">ਸਿੰਕ ਕਰਨ ਨੂੰ ਬਹਾਲ ਕਰਨ ਲਈ ਮੁੜ-ਕਨੈਕਟ ਕਰੋ</string>
     <!-- Preference for language -->
@@ -556,7 +550,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB ਰਾਹੀਂ ਰਿਮੋਟ ਡੀਬੱਗ ਕਰਨਾ</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">ਖੋਜ ਇੰਜਣ ਵੇਖੋ</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">ਖੋਜ ਇੰਜਣ ਵੇਖੋ</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 -->
@@ -576,6 +570,16 @@
 
     <!-- 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>
 
@@ -678,9 +682,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">ਐਡ-ਆਨ ਸਹਾਇਕ ਨਹੀਂ ਹੈ</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">ਐਡ-ਆਨ ਸਹਾਇਕ ਨਹੀਂ ਹੈ</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">ਐਡ-ਆਨ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">ਐਡ-ਆਨ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">ਐਡ-ਆਨ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਅਸਮਰੱਥ ਹਨ</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">ਇੱਕ ਜਾਂ ਵੱਧ ਐਡ-ਆਨ ਕੰਮ ਨਹੀਂ ਕਰ ਰਹੀਆਂ, ਜਿਸ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਅਸਥਿਰ ਹੋ ਰਿਹਾ ਹੈ। %1$s ਨੇ ਐਡ-ਆਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਅਸਫ਼ਲ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਸੀ।\n\nਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸ਼ੈਸ਼ਨ ਦੇ ਦੌਰਾਨ ਐਡ-ਆਨ ਮੁੜ-ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਵੇਗੀ।\n\nਐਡ-ਆਨ ਨੂੰ ਹਟਾਉਣ ਜਾਂ ਅਸਮਰੱਥ ਕਰਨ ਨਾਲ ਇਹ ਮਸਲਾ ਠੀਕ ਹੋ ਸਕਦਾ ਹੈ।</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">ਐਡ-ਆਨ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">ਐਡ-ਆਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਜਾਰੀ ਰੱਖੋ</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -695,6 +709,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">ਖਾਤੇ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲੋ, ਡਾਟਾ ਇਕੱਤਰ ਕਰਨ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ ਜਾਂ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਹਟਾਓ</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">ਹੁਣੇ ਸਿੰਕ ਕਰੋ</string>
     <!-- Preference category for sync -->
@@ -1958,7 +1974,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">ਜੋੜੋ</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">ਸੰਭਾਲੋ</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">ਸੰਭਾਲੋ</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">ਸੋਧੋ</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2207,7 +2223,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">ਰੀਵਿਊ ਚੈਕਰ</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">ਰੀਵਿਊ ਚੈਕਰ</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">ਰੀਵਿਊ ਚੈਕਰ</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">ਭਰੋਸੇਯੋਗ ਰੀਵਿਊ</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2228,17 +2246,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">ਅਸੀਂ ਉਤਪਾਦਾਂ ਦੇ ਰੀਵਿਊ ਦੀ ਭਰੋਸੇਯੋਗਤਾ ਦੀ ਪੜਤਾਲ ਕਰਨ ਲਈ Mozilla ਵਲੋਂ %s ਦੀ ਮਨਸੂਈ ਬੁੱਧੀ (AI) ਤਕਨੀਕ ਵਰਤ ਰਹੇ ਹਾਂ। ਇਹ ਤੁਹਾਨੂੰ ਸਿਰਫ਼ ਰੀਵਿਊ ਦੀ ਕੁਆਲਟੀ ਲਈ ਮਦਦ ਕਰੇਗਾ, ਉਤਪਾਦ ਦੀ ਕੁਆਲਟੀ ਲਈ ਨਹੀਂ।</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[ਅਸੀਂ ਹਰ ਉਤਪਾਦ ਦੇ ਰੀਵਿਊ ਲਈ A ਤੋਂ F ਤੱਕ <b>ਅੱਖਰ ਅਧਾਰਿਤ ਦਰਜਾ</b> ਦਿੱਤਾ ਹੈ।]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[ਅਸੀਂ ਹਰ ਉਤਪਾਦ ਦੇ ਰੀਵਿਊ ਲਈ A ਤੋਂ F ਤੱਕ <b>ਅੱਖਰ ਅਧਾਰਿਤ ਦਰਜਾ</b> ਦਿੱਤਾ ਹੈ।]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">ਭਰੋਸੇਯੋਗ ਰੀਵਿਊ। ਅਸੀਂ ਮੰਨਦੇ ਹਾਂ ਕਿ ਰੀਵਿਊ ਅਸਲ ਗਾਹਕ ਵਲੋਂ ਹਨ, ਜਿਸ ਨੇ ਇਮਾਨਦਾਰੀ ਨਾਲ ਨਿਰਪੱਖ ਰੀਵਿਊ ਦਿੱਤੇ ਹਨ।</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">ਸਾਨੂੰ ਲੱਗਦਾ ਹੈ ਰੀਵਿਊ ਭਰੋਸੇਯੋਗ ਹਨ।</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">ਅਸੀਂ ਮੰਨਦੇ ਹਾਂ ਕਿ ਭਰੋਸੇਯੋਗ ਅਤੇ ਗ਼ੈਰ-ਭਰੋਸੇਯੋਗ ਰੀਵਿਊ ਰਲਵੇਂ ਰੂਪ ਵਿੱਚ ਹੁੰਦੇ ਹਨ।</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">ਗ਼ੈਰਭਰੋਸੇਯੋਗ ਰੀਵਿਊ। ਅਸੀਂ ਮੰਨਦੇ ਹਾਂ ਕਿ ਰੀਵਿਊ ਨਕਲੀ, ਫ਼ਰਜ਼ੀ ਹੋਣ ਜਾਂ ਪੱਖਪਾਤੀ ਰੀਵਿਊ ਦੇਣ ਵਾਲਿਆਂ ਵਲੋਂ ਹੋਣ ਸਕਦੇ ਹਨ।</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">ਸਾਨੂੰ ਲੱਗਦਾ ਹੈ ਰੀਵਿਊ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹਨ।</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>ਅਡਜੱਸਟ ਕੀਤੀ ਰੇਟਿੰਗ</b> ਸਾਡੇ ਵਲੋਂ ਸਿਰਫ਼ ਭਰੋਸੇਯੋਗ ਮੰਨੇ ਗਏ ਰੀਵਿਊ ਦੇ ਆਧਾਰ ਉੱਤੇ ਹੈ।]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[ਪਿਛਲੇ 80 ਦਿਨਾਂ ਵਿੱਚ %s ਰੀਵਿਊਆਂ ਵਿੱਚੋਂ <b>ਹਾਈਲਾਈਟ</b> ਹਨ, ਜੋ ਸਾਨੂੰ ਜਾਪਦਾ ਹੈ ਕਿ ਭਰੋਸੇਯੋਗ ਹਨ।]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[ਪਿਛਲੇ 80 ਦਿਨਾਂ ਵਿੱਚ %s ਰੀਵਿਊਆਂ ਵਿੱਚੋਂ <b>ਹਾਈਲਾਈਟ</b> ਹਨ, ਜੋ ਸਾਨੂੰ ਜਾਪਦਾ ਹੈ ਕਿ ਭਰੋਸੇਯੋਗ ਹਨ।]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">%s ਬਾਰੇ ਹੋਰ ਸਿੱਖੋ।</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2248,7 +2270,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">ਰੀਵਿਊ ਚੈਕਰ ਵਿੱਚ ਇਸ਼ਤਿਹਾਰ ਵੇਖਾਓ</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">ਤੁਸੀਂ ਕਦੇ-ਕਦਾਈ ਸੰਬੰਧਿਤ ਉਤਪਾਦਾਂ ਦੇ ਇਸ਼ਤਿਹਾਰ ਵੇਖੋਗੇ। ਸਾਰੇ ਇਸ਼ਤਿਹਾਰ ਸਾਡੇ ਰੀਵਿਊ ਕੁਆਲਟੀ ਮਿਆਰਾਂ ਤੇ ਖਰ੍ਹੇ ਉਤਰਨੇ ਚਾਹੀਦੇ ਹਨ। %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">ਤੁਸੀਂ ਕਦੇ-ਕਦਾਈ ਸੰਬੰਧਿਤ ਉਤਪਾਦਾਂ ਦੇ ਇਸ਼ਤਿਹਾਰ ਵੇਖੋਗੇ। ਸਾਰੇ ਇਸ਼ਤਿਹਾਰ ਸਾਡੇ ਰੀਵਿਊ ਕੁਆਲਟੀ ਮਿਆਰਾਂ ਤੇ ਖਰ੍ਹੇ ਉਤਰਨੇ ਚਾਹੀਦੇ ਹਨ। %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">ਤੁਸੀਂ ਢੁੱਕਵੇਂ ਉਤਪਾਦਾਂ ਲਈ ਕਦੇ ਕਦਾਈ ਇਸ਼ਤਿਹਾਰ ਵੇਖੋਗੇ। ਅਸੀਂ ਭਰੋਸੇਯੋਗ ਉਤਪਾਦਾਂ ਲਈ ਹੀ ਇਸ਼ਤਿਹਾਰ ਦੇਵਾਂਗੇ। %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">ਹੋਰ ਜਾਣੋ</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2268,29 +2292,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">ਹੁਣੇ ਜਾਂਚੋ</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">ਹਾਲੇ ਚੋਖੇ ਰੀਵਿਊ ਨਹੀਂ ਹਨ</string>
+    <string name="review_quality_check_no_reviews_warning_title">ਹਾਲੇ ਚੋਖੇ ਰੀਵਿਊ ਨਹੀਂ ਹਨ</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">ਜਦੋਂ ਉਪਤਾਦ ਲਈ ਹੋਰ ਰੀਵਿਊ ਹੁੰਦੇ ਹਨ ਤਾਂ ਅਸੀਂ ਉਹਨਾਂ ਦੀ ਕੁਆਲਟੀ ਚੈਕ ਕਰ ਸਕਦੇ ਹਾਂ।</string>
+    <string name="review_quality_check_no_reviews_warning_body">ਜਦੋਂ ਉਪਤਾਦ ਲਈ ਹੋਰ ਰੀਵਿਊ ਹੁੰਦੇ ਹਨ ਤਾਂ ਅਸੀਂ ਉਹਨਾਂ ਦੀ ਕੁਆਲਟੀ ਚੈਕ ਕਰ ਸਕਦੇ ਹਾਂ।</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">ਉਤਪਾਦ ਮੌਜੂਦ ਨਹੀਂ ਹੈ</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">ਜੇ ਤੁਹਾਨੂੰ ਉਹ ਉਤਪਾਦ ਵਾਪਸ ਸਟਾਕ ਵਿੱਚ ਮਿਲੇ ਤਾਂ ਸਾਨੂੰ ਇਸ ਬਾਰੇ ਦੱਸਿਓ ਅਤੇ ਅਸੀਂ ਰੀਵਿਊ ਦੀ ਜਾਂਚ ਕਰਾਂਗੇ।</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">ਇਸ ਉਤਪਾਦ ਦੇ ਸਟਾਕ ਵਿੱਚ ਵਾਪਸ ਹੋਣ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">ਇਸ ਉਤਪਾਦ ਦੇ ਸਟਾਕ ਵਿੱਚ ਵਾਪਸ ਹੋਣ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">ਉਤਪਾਦ ਸਟਾਕ ਵਿੱਚ ਹੋਣ ਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">ਇਸ ਨੂੰ ਲਗਭਗ 60 ਸਕਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">ਇਸ ਨੂੰ ਲਗਭਗ 60 ਸਕਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ ਧੰਨਵਾਦ!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">ਸਾਡੇ ਕੋਲ ਇਸ ਉਤਪਾਦ ਦੇ ਰੀਵਿਊ 24 ਘੰਟਿਆਂ ਵਿੱਚ ਅੱਪਡੇਟ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ। ਬਾਅਦ ਵਿੱਚ ਵੇਖਿਓ।</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">ਅਸੀਂ ਇਹ ਰੀਵਿਊਆਂ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਾਂ</string>
+    <string name="review_quality_check_not_analyzable_info_title">ਅਸੀਂ ਇਹ ਰੀਵਿਊਆਂ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਾਂ</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">ਅਫ਼ਸੋਸ ਹੈ ਪਰ ਅਸੀਂ ਉਤਪਾਦਾਂ ਦੀਆਂ ਕੁਝ ਕਿਸਮਾਂ ਲਈ ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਾਂ। ਮਿਸਾਲ ਵਜੋਂ ਗਿਫ਼ਟ ਕਾਰਡ ਅਤੇ ਸਟਰੀਮਿੰਗ ਵੀਡੀਓ, ਸੰਗੀਤ ਤੇ ਖੇਡਾਂ।</string>
+    <string name="review_quality_check_not_analyzable_info_body">ਅਫ਼ਸੋਸ ਹੈ ਪਰ ਅਸੀਂ ਉਤਪਾਦਾਂ ਦੀਆਂ ਕੁਝ ਕਿਸਮਾਂ ਲਈ ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਾਂ। ਮਿਸਾਲ ਵਜੋਂ ਗਿਫ਼ਟ ਕਾਰਡ ਅਤੇ ਸਟਰੀਮਿੰਗ ਵੀਡੀਓ, ਸੰਗੀਤ ਤੇ ਖੇਡਾਂ।</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">ਜਾਣਕਾਰੀ ਛੇਤੀ ਹੀ ਆ ਰਹੀ ਹੈ</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2300,19 +2326,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">ਸਮਝੇ</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">ਹਾਲੇ ਕੋਈ ਵੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ</string>
+    <string name="review_quality_check_generic_error_title">ਹਾਲੇ ਕੋਈ ਵੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">ਅਸੀਂ ਮਸਲਾ ਠੀਕ ਕਰਨ ਲਈ ਕੰਮ ਕਰ ਰਹੇ ਹਾਂ। ਫ਼ੇਰ ਵਾਪਸ ਦੇਖਿਓ।</string>
+    <string name="review_quality_check_generic_error_body">ਅਸੀਂ ਮਸਲਾ ਠੀਕ ਕਰਨ ਲਈ ਕੰਮ ਕਰ ਰਹੇ ਹਾਂ। ਫ਼ੇਰ ਵਾਪਸ ਦੇਖਿਓ।</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ</string>
+    <string name="review_quality_check_no_connection_title">ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਫ਼ੇਰ ਸਫ਼ੇ ਨੂੰ ਮੁੜ-ਲੋਡ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+    <string name="review_quality_check_no_connection_body">ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਫ਼ੇਰ ਸਫ਼ੇ ਨੂੰ ਮੁੜ-ਲੋਡ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">ਇਹਨਾਂ ਰੀਵਿਊ ਬਾਰੇ ਹਾਲੇ ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ</string>
+    <string name="review_quality_check_no_analysis_title">ਇਹਨਾਂ ਰੀਵਿਊ ਬਾਰੇ ਹਾਲੇ ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">ਇਸ ਉਤਪਾਦ ਦੇ ਰੀਵਿਊਆਂ ਦੇ ਭਰੋਸੇਵੋਗ ਹੋਣ ਨੂੰ ਜਾਣਨ ਲਈ, ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕਰੋ। ਇਸ ਨੂੰ ਲਗਭਗ 60 ਸਕਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।</string>
+    <string name="review_quality_check_no_analysis_body">ਇਸ ਉਤਪਾਦ ਦੇ ਰੀਵਿਊਆਂ ਦੇ ਭਰੋਸੇਵੋਗ ਹੋਣ ਨੂੰ ਜਾਣਨ ਲਈ, ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕਰੋ। ਇਸ ਨੂੰ ਲਗਭਗ 60 ਸਕਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕਰੋ</string>
+    <string name="review_quality_check_no_analysis_link">ਰੀਵਿਊ ਕੁਆਲਟੀ ਦੀ ਜਾਂਚ ਕਰੋ</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">ਉਤਪਾਦ ਰੀਵਿਊ ਲਈ ਸਾਡੀ ਭਰੋਸੇਯੋਗ ਗਾਈਡ ਨੂੰ ਅਜ਼ਮਾਓ</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2341,11 +2367,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">ਰੀਵਿਊ ਚੈਕਰ ਖੋਲ੍ਹੋ</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">ਬੀਟਾ</string>
+    <string name="review_quality_check_beta_flag">ਬੀਟਾ</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">ਰੀਵਿਊ ਕੁਆਲਟੀ ਜਾਂਚ ਨੂੰ ਖੋਲ੍ਹੋ</string>
+    <string name="review_quality_check_open_handle_content_description">ਰੀਵਿਊ ਚੈਕਰ ਖੋਲ੍ਹੋ</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">ਰੀਵਿਊ ਕੁਆਲਟੀ ਜਾਂਚ ਨੂੰ ਬੰਦ ਕਰੋ</string>
+    <string name="review_quality_check_close_handle_content_description">ਰੀਵਿਊ ਚੈਕਰ ਬੰਦ ਕਰੋ</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">5 ਵਿੱਚੋਂ %1$s ਤਾਰੇ</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 961bea442..faada886e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -324,16 +324,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Nie teraz</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Używaj przeglądarki %s za każdym razem</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Używaj przeglądarki Firefox za każdym razem</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s stawia ludzi ponad zyski i chroni Twoją prywatność, blokując elementy śledzące między witrynami.\n\nWięcej informacji znajdziesz w naszych %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox stawia ludzi ponad zyski i chroni Twoją prywatność, blokując elementy śledzące między witrynami.\n\nWięcej informacji znajdziesz w naszych zasadach ochrony prywatności.</string>
@@ -353,15 +346,9 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Nie teraz</string>
 
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Dzięki powiadomieniom lepiej wykorzystasz przeglądarkę %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Dzięki powiadomieniom lepiej wykorzystasz przeglądarkę Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Przesyłaj karty między urządzeniami, zarządzaj pobieranymi plikami i otrzymuj wskazówki, jak najlepiej wykorzystać przeglądarkę %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Przesyłaj karty między urządzeniami, zarządzaj pobieranymi plikami i otrzymuj wskazówki, jak najlepiej wykorzystać przeglądarkę Firefox.</string>
@@ -516,11 +503,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Ułatwienia dostępu</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Własny serwer konta Firefoksa</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Własny serwer kont Firefoksa</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Własny serwer kont Mozilli</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Własny serwer synchronizacji</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Zmieniono serwer konta Firefoksa/synchronizacji. Wyłączanie aplikacji, aby zastosować zmiany…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Zmieniono serwer kont Firefoksa/synchronizacji. Wyłączanie aplikacji, aby zastosować zmiany…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Zmieniono serwer kont Mozilli/synchronizacji. Wyłączanie aplikacji, aby zastosować zmiany…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -536,7 +527,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Zaloguj się i synchronizuj karty, zakładki, hasła i więcej.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Konto Firefoksa</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Konto Firefoksa</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Konto Mozilli</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Połącz ponownie, aby wznowić synchronizację</string>
     <!-- Preference for language -->
@@ -548,7 +541,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Zdalne debugowanie przez USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Wyszukiwarki</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Wyszukiwarki</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Podpowiedzi wyszukiwania</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -568,6 +561,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Automatyczne uzupełnianie adresów</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Podpowiedzi sponsorów</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">Wspieraj przeglądarkę %1$s, od czasu do czasu wyświetlając sponsorowane podpowiedzi</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">Podpowiedzi przeglądarki %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Otrzymuj podpowiedzi z Internetu związane z wyszukiwanymi słowami</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Otwieranie odnośników w aplikacjach</string>
 
@@ -669,9 +672,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Dodatek nie jest obsługiwany</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Dodatek nie jest obsługiwany</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Dodatek jest już zainstalowany</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Dodatek jest już zainstalowany</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Dodatki zostały tymczasowo wyłączone</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Co najmniej jeden dodatek przestał działać, przez co system stał się niestabilny. %1$s bezskutecznie próbował ponownie włączyć dodatki.\n\nDodatki nie zostaną ponownie włączone w czasie tej sesji.\n\nUsunięcie lub wyłączenie dodatków może naprawić ten problem.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Spróbuj ponownie włączyć dodatki</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Kontynuuj z wyłączonymi dodatkami</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -687,6 +701,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Zarządzaj kontem</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Zmień hasło, zarządzaj zbieraniem danych lub usuń konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronizuj</string>
     <!-- Preference category for sync -->
@@ -1945,7 +1961,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Dodaj</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Zapisz</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Zapisz</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Edytuj</string>
     <!-- Text for the menu button to delete a search engine -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8c11a1647..a1e68e482 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -83,7 +83,7 @@
     <!-- 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">Aba a próxima aba privativa com apenas um toque.</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">Adicionar à tela inicial do dispositivo</string>
+    <string name="private_mode_cfr_pos_button_text">Adicionar à tela do dispositivo</string>
     <!-- Text for the negative button to decline adding a Private Browsing shortcut to the Home screen -->
     <string name="cfr_neg_button_text">Não, obrigado</string>
 
@@ -204,7 +204,7 @@
     <!-- Browser menu toggle that requests a desktop site -->
     <string name="browser_menu_desktop_site">Site do desktop</string>
     <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
-    <string name="browser_menu_add_to_homescreen">Adicionar à tela</string>
+    <string name="browser_menu_add_to_homescreen">Adicionar à tela do dispositivo</string>
     <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
     <string name="browser_menu_install_on_homescreen">Instalar</string>
     <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button -->
@@ -326,16 +326,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Agora não</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Torne o %s seu navegador preferido</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Torne o Firefox seu navegador padrão</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">O %1$s coloca as pessoas acima dos lucros e defende sua privacidade bloqueando rastreadores entre sites.\n\nSaiba mais em nosso %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">O Firefox coloca as pessoas acima dos lucros e defende sua privacidade bloqueando rastreadores entre sites.\n\nSaiba mais em nosso aviso de privacidade.</string>
@@ -354,15 +347,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Entrar</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Agora não</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Notificações ajudam você a aproveitar mais o %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Notificações ajudam você a aproveitar mais o Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Envie abas entre dispositivos, gerencie downloads e receba dicas de como aproveitar ao máximo o %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Envie abas entre dispositivos, gerencie downloads e receba dicas de como aproveitar ao máximo o Firefox.</string>
@@ -518,11 +505,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Acessibilidade</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de conta Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de conta Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor personalizado de conta Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor personalizado de sincronização</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Modificado o servidor de conta/sincronização Firefox. Saindo do aplicativo para aplicar as mudanças…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Modificado o servidor de conta/sincronização Firefox. Saindo do aplicativo para aplicar as mudanças…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Modificado o servidor de conta Mozilla e sincronização. Saindo do aplicativo para aplicar as mudanças…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Conta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -538,7 +529,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Entre para sincronizar abas, favoritos, senhas e muito mais.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Conta Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Conta Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Conta Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Reconecte para retomar a sincronização</string>
     <!-- Preference for language -->
@@ -569,6 +562,16 @@
     <string name="preferences_account_settings">Configurações da conta</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Completar endereços automaticamente</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugestões de patrocinadores</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">Apoie o %1$s com sugestões patrocinadas ocasionais</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">Sugestões do %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Receber sugestões da web relacionadas à sua pesquisa</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir links em aplicativos</string>
 
@@ -671,9 +674,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Extensão não suportada</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Extensão não suportada</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Extensão já instalada</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Extensão já instalada</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">As extensões estão temporariamente desativadas</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Uma ou mais extensões pararam de funcionar, tornando o sistema instável. O %1$s tentou reiniciar as extensões sem sucesso.\n\nAs extensões não serão reiniciados durante a sessão atual.\n\nRemover ou desativar extensões pode resolver esse problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Tentar reiniciar as extensões</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar com extensões desativadas</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -689,6 +703,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gerenciar conta</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Mude sua senha, gerencie a coleta de dados ou exclua sua conta</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar agora</string>
     <!-- Preference category for sync -->
@@ -1705,7 +1721,7 @@
     <string name="browser_toolbar_url_copied_to_clipboard_snackbar">URL copiada para área de transferência</string>
 
     <!-- Title text for the Add To Homescreen dialog -->
-    <string name="add_to_homescreen_title">Adicionar à tela inicial do dispositivo</string>
+    <string name="add_to_homescreen_title">Adicionar à tela do dispositivo</string>
     <!-- Cancel button text for the Add to Homescreen dialog -->
     <string name="add_to_homescreen_cancel">Cancelar</string>
     <!-- Add button text for the Add to Homescreen dialog -->
@@ -2218,17 +2234,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Usamos tecnologia de inteligência artificial do %s da Mozilla para analisar a confiabilidade das avaliações de produtos. Isso só ajuda a estimar a qualidade da avaliação, não a qualidade do produto.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Atribuímos às avaliações de cada produto uma <b>nota com letra</b> de A a F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Atribuímos às avaliações de cada produto uma <b>nota com letra</b> de A a F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Avaliações confiáveis. Acreditamos que as avaliações provavelmente são de consumidores reais que deixaram avaliações honestas e imparciais.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Acreditamos que as avaliações são confiáveis.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Acreditamos que há uma mistura de avaliações confiáveis e não confiáveis.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Avaliações não confiáveis. Acreditamos que as avaliações provavelmente são falsas ou de avaliadores tendenciosos.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Acreditamos que as avaliações não são confiáveis.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>classificação ajustada</b> é baseada apenas em avaliações que acreditamos ser confiáveis.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[Os <b>destaques</b> são provenientes de avaliações de %s feitas nos últimos 80 dias e que acreditamos ser confiáveis.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[Os <b>destaques</b> são provenientes de avaliações de %s feitas nos últimos 80 dias e que acreditamos ser confiáveis.]]></string>
 
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Saiba mais sobre o %s.</string>
@@ -2259,9 +2279,9 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Verificar agora</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ainda não há avaliações suficientes</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ainda não há avaliações suficientes</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Quando este produto tiver mais avaliações, poderemos verificar sua qualidade.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Quando este produto tiver mais avaliações, poderemos verificar sua qualidade.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">O produto não está disponível</string>
 
@@ -2270,19 +2290,19 @@
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que tem este produto em estoque novamente</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Verificando a qualidade das avaliações</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Verificando a qualidade das avaliações</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Verificando a qualidade das avaliações</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Verificando a qualidade das avaliações</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Isso pode demorar cerca de 60 segundos.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Isso pode demorar cerca de 60 segundos.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Obrigado por informar!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Devemos ter informações sobre as avaliações deste produto em até 24 horas. Verifique novamente mais tarde.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Não podemos verificar essas avaliações</string>
+    <string name="review_quality_check_not_analyzable_info_title">Não podemos verificar essas avaliações</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Infelizmente, não podemos verificar a qualidade das avaliações de determinados tipos de produtos. Por exemplo, cartões-presente e transmissão de vídeo, música e jogos.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Infelizmente, não podemos verificar a qualidade das avaliações de determinados tipos de produtos. Por exemplo, cartões-presente e transmissão de vídeo, música e jogos.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informações em breve</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2292,19 +2312,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Entendi</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Nenhuma informação disponível no momento</string>
+    <string name="review_quality_check_generic_error_title">Nenhuma informação disponível no momento</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Estamos trabalhando para resolver o problema. Verifique novamente mais tarde.</string>
+    <string name="review_quality_check_generic_error_body">Estamos trabalhando para resolver o problema. Verifique novamente mais tarde.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Sem conexão de rede</string>
+    <string name="review_quality_check_no_connection_title">Sem conexão de rede</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Verifique sua conexão de rede e experimente recarregar a página.</string>
+    <string name="review_quality_check_no_connection_body">Verifique sua conexão de rede e experimente recarregar a página.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Ainda não há informações sobre estas avaliações</string>
+    <string name="review_quality_check_no_analysis_title">Ainda não há informações sobre estas avaliações</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Para saber se as avaliações deste produto são confiáveis, verifique a qualidade das avaliações. Demora apenas cerca de 60 segundos.</string>
+    <string name="review_quality_check_no_analysis_body">Para saber se as avaliações deste produto são confiáveis, verifique a qualidade das avaliações. Demora apenas cerca de 60 segundos.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Verificar qualidade das avaliações</string>
+    <string name="review_quality_check_no_analysis_link">Verificar qualidade das avaliações</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Experimente nosso guia confiável de avaliações de produtos</string>
 
@@ -2334,11 +2354,11 @@
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir o verificador de avaliações</string>
 
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Abrir o verificador de qualidade de avaliações</string>
+    <string name="review_quality_check_open_handle_content_description">Abrir o verificador de avaliações</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Fechar o verificador de qualidade de avaliações</string>
+    <string name="review_quality_check_close_handle_content_description">Fechar o verificador de avaliações</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrelas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5a9ca25b5..6693eb6f3 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -67,6 +67,19 @@
        Mitos comuns sobre a navegação privada
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Não deixe evidências neste dispositivo</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">%1$s exclui os seus cookies, histórico e dados do site quando fecha todas as suas janelas privadas. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">Quem poderá ver a minha atividade?</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">Iniciar o seu próximo separador privado com um toque.</string>
@@ -90,6 +103,11 @@
     <string name="tcp_cfr_learn_more">Saber mais sobre a Proteção Total de Cookies</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">Toque aqui para iniciar uma nova sessão privada. Exclua o seu histórico, cookies — tudo.</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">É necessário acesso à câmara. Aceda às definições do Android, toque em permissões e toque em permitir.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -307,16 +325,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Agora não</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Faça do %s o seu navegador de eleição</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Faça do Firefox o seu navegador de eleição</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">O %1$s coloca as pessoas acima dos lucros e defende a sua privacidade bloqueando rastreadores entre sites.\n\nSaiba mais no nosso %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">O Firefox coloca as pessoas acima dos lucros e defende a sua privacidade bloqueando rastreadores entre sites.\n\nSaiba mais na nossa informação de privacidade.</string>
@@ -336,15 +347,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Iniciar sessão</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Agora não</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">As notificações permitem-lhe fazer mais com o %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">As notificações permitem-lhe fazer mais com o Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Partilhe separadores entre dispositivos, faça a gestão das transferências e receba dicas sobre como aproveitar o %s ao máximo.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Partilhe separadores entre dispositivos, faça a gestão das transferências e receba dicas sobre como aproveitar o Firefox ao máximo.</string>
@@ -353,6 +358,15 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Agora não</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Experimente o widget de pesquisa do Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">Com o Firefox no ecrã inicial, terá acesso fácil ao navegador que prioriza a privacidade e bloqueia rastreadores entre sites.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Adicionar a widget do Firefox</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Agora não</string>
 
@@ -489,11 +503,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Acessibilidade</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Servidor personalizado de conta Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor personalizado de conta Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Servidor de conta Mozilla personalizado</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Servidor de sincronização personalizado</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Servidor de conta Firefox / Sincronização modificado. A sair da aplicação para aplicar alterações…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Servidor de conta Firefox / Sincronização modificado. A sair da aplicação para aplicar alterações…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Servidor de conta/Sincronização Mozilla modificado. A sair da aplicação para aplicar alterações…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Conta</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -509,7 +527,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Inicie sessão para sincronizar os separadores, marcadores, palavras-passe e mais.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Conta Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Conta Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Conta Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Restabeleça a ligação para retomar a sincronização</string>
     <!-- Preference for language -->
@@ -541,6 +561,16 @@
     <string name="preferences_account_settings">Definições da conta</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Conclusão automática de endereços</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sugestões de patrocinadores</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">Apoie o %1$s com sugestões patrocinadas ocasionais</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">Sugestões de %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Obtenha sugestões da Internet relacionadas com a sua pesquisa</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Abrir ligações em aplicações</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -641,9 +671,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">O extra não é suportado</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">O extra não é suportado</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">O extra já está instalado</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">O extra já está instalado</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">As extensões estão temporariamente desativadas</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Um ou mais extensões pararam de funcionar, tornando o sistema instável. %1$s tentou reiniciar a(s) extensão(ões) sem sucesso.\n\nAs extensões não serão reiniciadas durante a sessão atual.\n\nRemover ou desativar extensões pode resolver este problema.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Experimente reiniciar as extensões</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Continuar com as extensões desativadas</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -658,6 +698,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Gerir conta</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Altere a sua palavra-passe, faça a gestão da recolha de dados ou elimine a sua conta</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar agora</string>
     <!-- Preference category for sync -->
@@ -1329,6 +1371,8 @@
     <string name="snackbar_private_tab_closed">Separador privado fechado</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Separadores privados fechados</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Dados de navegação privada excluídos</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">ANULAR</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -2162,6 +2206,151 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ir para as definições</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Verificador de avaliações</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Avaliações confiáveis</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mistura de avaliações confiáveis e não confiáveis</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Avaliações não confiáveis</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Quão confiáveis são estas avaliações?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Classificação ajustada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Avaliações não confiáveis removidas</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Destaques das avaliações recentes</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Como determinamos a qualidade da avaliação</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Utilizamos a tecnologia de IA de %s da Mozilla para verificar a confiabilidade das análises de produtos. Isto apenas irá ajudar a avaliar a qualidade da avaliação e não a qualidade do produto.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Atribuímos às avaliações de cada produto uma <b>classificação baseada em letras</b> de A a F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Avaliações confiáveis. Acreditamos que os comentários provavelmente são de clientes reais que deixaram comentários honestos e imparciais.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Acreditamos que as avaliações são confiáveis.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Acreditamos que há uma mistura de avaliações confiáveis e não confiáveis.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Avaliações não confiáveis. Acreditamos que as avaliações provavelmente são falsas ou de avaliadores tendenciosos.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Acreditamos que as avaliações não são confiáveis.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[A <b>classificação ajustada</b> é baseada apenas em avaliações que acreditamos serem confiáveis.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Os destaques</b> são de %s avaliações dos últimos 80 dias que acreditamos serem confiáveis.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Saiba mais acerca do %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">como %s da Mozilla determina a qualidade da revisão</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Definições</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Mostrar anúncios no verificador de avaliações</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Irá ver anúncios ocasionais de produtos relevantes. Todos os anúncios devem atender aos nossos padrões de revisão da qualidade. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Saber mais</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Desativar o verificador de avaliações</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Mais a considerar</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Anúncio de %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">O verificador de avaliações é desenvolvido por %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">O verificador de avaliações é suportado por %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s por Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Novas informações para verificar</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Verificar agora</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Ainda não há avaliações suficientes</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Quando este produto tiver mais avaliações, poderemos verificar a sua qualidade.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">O produto não está disponível</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Se perceber que este produto está novamente em stock, reporte e iremos verificar as avaliações.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Informar que este produto está novamente em stock</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">A verificar a qualidade da avaliação</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">A verificar a qualidade da avaliação</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Isto pode demorar cerca de 60 segundos.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Obrigado por reportar!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Devemos receber informações sobre as avaliações deste produto dentro de 24 horas. Volte mais tarde.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Não podemos verificar estas avaliações</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Infelizmente, não podemos verificar a qualidade da avaliação para determinados tipos de produtos. Por exemplo, cartões-presente e streaming de vídeo, música e jogos.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informações em breve</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Devemos receber informações sobre as avaliações deste produto dentro de 24 horas. Volte mais tarde.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">A análise está atualizada</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Percebi</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Nenhuma informação disponível neste momento</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Estamos a trabalhar para resolver o problema. Por favor, volte em breve.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Sem ligação à rede</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Verifique a sua ligação à rede e tente recarregar a página.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Ainda não há informações sobre estas avaliações</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Para saber se as avaliações deste produto são confiáveis, verifique a qualidade das avaliações. Demora apenas cerca de 60 segundos.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Verificar a qualidade da avaliação</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Experimente o nosso guia confiável para avaliações de produtos</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Veja o quão confiáveis são as avaliações dos produtos em %1$s antes de comprar. O verificador de avaliações, uma funcionalidade experimental do %2$s, está integrado no navegador. Funciona em %3$s e também em %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Utilizando o poder do %1$s da Mozilla, ajudamos a que evite avaliações tendenciosas e falsas. O nosso modelo de IA está sempre a melhorar para sua proteção, enquanto faz compras. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Saber mais</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Ao selecionar “Sim, experimentar”, concorda com a %2$s e %3$s de %1$s da Mozilla.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">política de privacidade</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">termos de utilização</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Sim, experimentar</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Agora não</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Descubra se pode confiar nas avaliações deste produto — antes de comprar.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Experimentar o verificador de avaliações</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Estas avaliações são confiáveis? Confirme agora para ver uma classificação ajustada.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Abrir o verificador de avaliações</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Abrir o verificador de avaliações</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Fechar o verificador de avaliações</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s de 5 estrelas</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">Mostrar menos</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 4ae1fa6d0..d6de73b8f 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -318,16 +318,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Betg ussa</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Tscherna %s sco navigatur preferì</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Fa da Firefox tes navigatur preferì</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s dat la prioritad a las persunas, betg al profit e defenda tia sfera privata cun bloccar fastizaders interpaginals.\n\nUlteriuras infurmaziuns en nossa %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox dat la prioritad a las persunas, betg al profit e defenda tia sfera privata cun bloccar fastizaders interpaginals.\n\nUlteriuras infurmaziuns èn da chattar en nossas infurmaziuns davart la protecziun da datas.</string>
@@ -346,15 +339,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">S\'annunziar</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Betg ussa</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Communicaziuns ta gidan da far dapli cun %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Communicaziuns ta gidan da far dapli cun Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Trametta tabs dad in apparat a l\'auter, administrescha telechargiadas e ve a savair co profitar maximalmain da %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Trametta tabs dad in apparat a l\'auter, administrescha telechargiadas e ve a savair co profitar il meglier pussaivel da Firefox.</string>
@@ -507,11 +494,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Accessibladad</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Server persunalisà per tes conto da Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Server persunalisà per tes conto da Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Agen server per contos Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Server persunalisà per Sync</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Il server per il conto da Firefox/Sync è vegnì modifitgà. L\'applicaziun vegn serrada per applitgar las midadas…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Il server per il conto da Firefox/Sync è vegnì modifitgà. L\'applicaziun vegn serrada per applitgar las midadas…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Il server per il conto da Mozilla/Sync è vegnì modifitgà. L\'applicaziun vegn serrada per applitgar las midadas…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Conto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -527,7 +518,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">T\'annunzia per sincronisar tabs, segnapaginas, pleds-clav e dapli.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Conto da Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Conto da Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Conto Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ta reconnectescha per cuntinuar cun la sincronisaziun</string>
     <!-- Preference for language -->
@@ -539,7 +532,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Debugging a distanza via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Mussar las maschinas da tschertgar</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Mussar las maschinas da tschertgar</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mussar propostas da tschertga</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -559,6 +552,16 @@
     <string name="preferences_account_settings">Parameters dal conto</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Cumplettar automaticamain URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Propostas da sponsurs</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">Sustegna %1$s cun propostas occasiunalas sponsurisadas </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">Propostas da %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Retschaiva propostas dal web en connex cun tia tschertga</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Avrir colliaziuns en apps</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -658,9 +661,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Il supplement na vegn betg sustegnì</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Il supplement na vegn betg sustegnì</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Il supplement è gia installà</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Il supplement è gia installà</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Ils supplements èn deactivads temporarmain</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">In u plirs supplements na funcziunan betg pli e rendan tes sistem instabel. %1$s ha empruvà senza success da reaviar il(s) supplement(s).\n\nIls supplements na vegnan betg reaviads durant la sesida actuala.\n\nEventualmain sa schlia il problem cun allontanar u deactivar supplements.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Empruvar da reaviar ils supplements</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Cuntinuar cun supplements deactivads</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -675,6 +688,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Administrar il conto</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Midar tes pled-clav, administrar la rimnada da datas u stizzar tes conto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronisar ussa</string>
     <!-- Preference category for sync -->
@@ -1937,7 +1952,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Agiuntar</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Memorisar</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Memorisar</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Modifitgar</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2185,6 +2200,172 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Ir als parameters</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Verificatur da recensiuns</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Verificaziun da recensiuns</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Recensiuns fidablas</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Maschaida da recensiuns fidablas e dubiusas</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Recensiuns dubiusas</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Quant fidablas èn questas recensiuns?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Valitaziun rectifitgada</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Allontanà recensiuns dubiusas</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Highlights da las ultimas recensiuns</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Co nus determinain la qualitad da las recensiuns</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Nus utilisain tecnologia dad intelligenza artifiziala da %s da Mozilla per analisar quant fidablas che las recensiuns da products èn. Quai gida dentant mo a giuditgar la qualitad da las recensiuns, betg la qualitad dals products.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Nus attribuin a mintga recensiun dad in product ina <b>nota en letras</b> dad A enfin F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Recensiuns fidablas. Nus cartain che las recensiuns èn cun auta probabilitad da dretgs clients che han scrit recensiuns onestas independentas.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nus cartain che las recensiuns èn fidablas.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Nus cartain ch\'i sa tracta dad ina maschaida da recensiuns fidablas e dubiusas.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Revistas dubiusas. Nus cartain che las recensiuns èn probablamain sfalsifitgadas u da recensents partischants.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Nus cartain che las recensiuns n\'èn betg fidablas.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[La <b>valitaziun rectifitgada</b> sa basa mo sin recensiuns da las qualas nus cartain ch\'ellas sajan fidablas.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[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">co %s da Mozilla determinescha la qualitad da las recensiuns</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Parameters</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Mussar reclamas en la verificaziun da recensiuns</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">I vegnan mussadas reclamas occasiunalas per products relevants. Tut las reclamas ston resguardar noss standards da qualitad per recensiuns. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">I vegnan mussadas reclamas occasiunalas per products relevants. Nus faschain mo reclama per products cun recensiuns fidablas. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Ulteriuras infurmaziuns</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Deactivar la verificaziun da recensiuns</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Dapli pussaivladads</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Reclama da %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Il verificatur da recensiuns funcziuna grazia a %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Il verificatur da recensiuns funcziuna grazia a %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s da Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Novas infurmaziuns da consultar</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Controllar ussa</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Anc betg avunda recensiuns</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Uschespert che quest product ha dapli recensiuns, vegnin nus a pudair controllar lur qualitad.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Il product n\'è betg disponibel</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Sche ti vesas che quest product è puspè disponibel, annunzia quai e nus vegnin a lavurar per controllar las recensiuns.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Rapportar che quest product è puspè disponibel</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Annunziar ch\'il product è disponibel</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Controllar la qualitad da las recensiuns</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Controllar la qualitad da las recensiuns</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Quai po cuzzar var 60 secundas.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Grazia per rapportar!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Nus stuessan avair infurmaziuns davart las recensiuns da quest product entaifer las proximas 24 uras. Controllescha pli tard anc ina giada.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Nus na pudain betg controllar questas recensiuns</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Deplorablamain na pudain nus betg controllar la qualitad da las recensiuns da tscherts tips da products. Per exempel cartas da regal e videostreaming, musica e gieus.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Proximamain datti ulteriuras infurmaziuns</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Nus quintain dad avair infurmaziuns davart las recensiuns da quest product entaifer las proximas 24 uras. Controllescha pli tard anc ina giada.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">L\'analisa è actuala</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Jau hai chapì</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Naginas infurmaziuns disponiblas actualmain</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Nus lavurain per schliar quest problem. Dà svelt puspè in tgit.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Nagina connexiun cun l\'internet</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Controllescha tia connexiun cun la rait ed emprova lura da rechargiar la pagina.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">Anc naginas infurmaziuns davart questas recensiuns</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Per vegnir a savair sche las recensiuns da quest product èn fidablas, controllescha la qualitad da las recensiuns. Quai cuzza mo var 60 secundas.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Controllar la qualitad da las recensiuns</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Emprova noss guid fidà per recensiuns da products</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Ve a savair quant fidablas che recensiuns da products èn sin %1$s avant che ti als cumpras. Il verificatur da recensiuns, ina funcziun experimentala da %2$s, è integrada directamain en il navigatur. Quai funcziuna cun %3$s ed era cun %4$s.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Nus duvrain il potenzial da %1$s da Mozilla per ta gidar ad evitar recensiuns nunautenticas e tendenziusas. Noss model dad intelligenza artifiziala vegn meglierà permanentamain per ta proteger durant che ti fas cumpras. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Ulteriuras infurmaziuns</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">Cun tscherner «Gea, empruvar» acceptas ti las %2$s e las %3$s da %1$s da Mozilla.</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">directivas per la protecziun da datas</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">cundiziuns d\'utilisaziun</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Gea, empruvar</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Betg ussa</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Ve a savair sche ti pos ta fidar da las recensiuns da quest product – avant che ti al cumpras.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Emprova il verificatur da recensiuns</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Èn questas recensiuns fidablas? Controllescha ussa per vesair ina valitaziun rectifitgada.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Avrir il verificatur da recensiuns</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Avrir la verificaziun da recensiuns</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Serrar la verificaziun da recensiuns</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s da 5 stailas</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Mussar damain</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Mussar dapli</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Qualitad</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Pretsch</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Spediziun</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Emballadi ed apparientscha</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Cumpetitivitad</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">reducir</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d77f24c87..1c7f86dec 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -195,7 +195,7 @@
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Дополнения</string>
     <!-- Browser menu button that opens account settings -->
-    <string name="browser_menu_account_settings">Ваша учётка</string>
+    <string name="browser_menu_account_settings">Ваш аккаунт</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Дополнения отсутствуют</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -332,16 +332,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Не сейчас</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Сделайте %s своим повседневным браузером</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Сделайте Firefox своим повседневным браузером</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s ставит людей выше прибыли и защищает вашу приватность, блокируя межсайтовые трекеры.\n\nУзнайте больше в нашем %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox ставит людей выше прибыли и защищает вашу приватность, блокируя межсайтовые трекеры.\n\nУзнайте больше в нашем уведомлении о конфиденциальности.</string>
@@ -360,15 +353,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Войти</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Не сейчас</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Уведомления помогают вам делать больше с %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Уведомления помогают вам делать с Firefox больше</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Отправляйте вкладки между устройствами, управляйте загрузками и получайте советы по максимально эффективному использованию %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Отправляйте вкладки между устройствами, управляйте загрузками и получайте советы по максимально эффективному использованию Firefox.</string>
@@ -524,11 +511,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Специальные возможности</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Пользовательский сервер аккаунта Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Пользовательский сервер аккаунта Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Пользовательский сервер аккаунтов Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Пользовательский сервер Синхронизации</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Сервер аккаунтов/синхронизации Firefox был изменён. Закрываем приложение, чтобы применить изменения…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Сервер аккаунтов/синхронизации Firefox был изменён. Закрываем приложение, чтобы применить изменения…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Изменён аккаунт Mozilla/сервер синхронизации. Выход из приложения для применения изменений…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Аккаунт</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -544,7 +535,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Входить для синхронизации вкладок, закладок, паролей и многого другого.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Аккаунт Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Аккаунт Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Подключитесь снова, чтобы возобновить синхронизацию</string>
     <!-- Preference for language -->
@@ -556,7 +549,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Удалённая отладка по USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Показывать поисковые системы</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Показывать поисковые системы</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 -->
@@ -576,6 +569,16 @@
 
     <!-- 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>
 
@@ -676,9 +679,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Дополнение не поддерживается</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Дополнение не поддерживается</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Дополнение уже установлено</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Дополнение уже установлено</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Дополнения временно отключены</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Одно или несколько дополнений перестали работать, что сделало вашу систему нестабильной. %1$s безуспешно пытался перезапустить дополнения.\n\nДополнения не будут перезапущены во время текущего сеанса.\n\nУдаление или отключение дополнений может решить эту проблему.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Попробовать перезапустить дополнения</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Продолжить с отключенными дополнениями</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -693,6 +706,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Управление аккаунтом</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Измените свой пароль, управляйте сбором данных или удалите свою учетную запись</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Синхронизировать</string>
     <!-- Preference category for sync -->
@@ -1964,7 +1979,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Добавить</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Сохранить</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Сохранить</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Изменить</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -1985,7 +2000,7 @@
     <!-- Placeholder text shown in the Search String TextField before a user enters text -->
     <string name="search_add_custom_engine_search_string_hint_2">URL для поиска</string>
     <!-- Description text for the Search String TextField. The %s is part of the string -->
-    <string name="search_add_custom_engine_search_string_example" formatted="false">Замените строку запроса на “%s”. Пример:\nhttps://www.google.com/search?q=%s</string>
+    <string name="search_add_custom_engine_search_string_example" formatted="false">Замените строку запроса на «%s». Пример:\nhttps://www.google.com/search?q=%s</string>
 
     <!-- Accessibility description for the form in which details about the custom search engine are entered -->
     <string name="search_add_custom_engine_form_description">Сведения о выбранной поисковой системе</string>
@@ -2214,7 +2229,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Инструмент проверки отзывов</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Инструмент проверки отзывов</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Проверка отзывов</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Достоверные отзывы</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2234,17 +2251,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Мы используем технологию ИИ от %s от Mozilla для проверки достоверности обзоров продуктов. Это поможет вам оценить только качество отзывов, а не качество продукта.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Мы присваиваем отзывам каждого продукта <b>буквенную оценку</b> от A до F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Мы присваиваем отзывам каждого продукта <b>буквенную оценку</b> от A до F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Достоверные отзывы. Мы считаем, что эти отзывы, скорее всего, написаны реальными клиентами, которые оставили честные и объективные отзывы.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мы считаем, что эти отзывы заслуживают доверия.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Мы считаем, что здесь находится смесь достоверных и недостоверных отзывов.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Недостоверные отзывы. Мы считаем, что эти отзывы, скорее всего, фейковые или написаны предвзятыми рецензентами.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мы считаем, что эти отзывы недостоверны.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Скорректированная оценка</b> основана только на отзывах, которые мы считаем достоверными.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Основные сведения</b> взяты из отзывов на %s за последние 80 дней, которые мы считаем надежными.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Основные сведения</b> взяты из отзывов на %s за последние 80 дней, которые мы считаем надежными.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Узнайте больше о %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2254,7 +2275,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Показывать рекламу в инструменте проверки отзывов</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Время от времени вы будете видеть рекламу соответствующих продуктов. Все объявления должны соответствовать нашим стандартам качества проверки. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Время от времени вы будете видеть рекламу соответствующих продуктов. Все объявления должны соответствовать нашим стандартам качества проверки. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Время от времени вы будете видеть рекламу интересных продуктов. Мы рекламируем только товары с достоверными отзывами. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Подробнее</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2274,29 +2297,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Проверить сейчас</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Пока недостаточно отзывов</string>
+    <string name="review_quality_check_no_reviews_warning_title">Пока недостаточно отзывов</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Когда у этого товара будет больше отзывов, мы сможем проверить его качество.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Когда у этого товара будет больше отзывов, мы сможем проверить его качество.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Товар недоступен</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Если вы увидите, что этот товар снова в наличии, сообщите об этом, и мы проверим отзывы.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Сообщить, что этот товар снова в наличии</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Сообщить, что этот товар снова в наличии</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Сообщить о наличии товара на складе</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Проверяем качество отзывов</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Проверяем качество отзывов</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Проверяем качество отзывов</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Проверяем качество отзывов</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Это может занять около 60 секунд.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Это может занять около 60 секунд.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Спасибо за сообщение!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Мы должны получить информацию об отзывах на этот продукт в течение 24 часов. Пожалуйста, зайдите позже.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Мы не можем проверить эти отзывы</string>
+    <string name="review_quality_check_not_analyzable_info_title">Мы не можем проверить эти отзывы</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">К сожалению, мы не можем проверить качество отзывов на некоторые виды товаров. Например, подарочные карты и потоковое видео, музыку и игры.</string>
+    <string name="review_quality_check_not_analyzable_info_body">К сожалению, мы не можем проверить качество отзывов на некоторые виды товаров. Например, подарочные карты и потоковое видео, музыку и игры.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Информация скоро появится</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2306,19 +2331,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Понятно</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">На данный момент нет доступной информации</string>
+    <string name="review_quality_check_generic_error_title">На данный момент нет доступной информации</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Мы работаем над решением проблемы. Пожалуйста, зайдите в ближайшее время.</string>
+    <string name="review_quality_check_generic_error_body">Мы работаем над решением проблемы. Пожалуйста, зайдите в ближайшее время.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Нет подключения к сети</string>
+    <string name="review_quality_check_no_connection_title">Нет подключения к сети</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Проверьте подключение к сети и попробуйте перезагрузить страницу.</string>
+    <string name="review_quality_check_no_connection_body">Проверьте подключение к сети и попробуйте перезагрузить страницу.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Информации об этих отзывах пока нет</string>
+    <string name="review_quality_check_no_analysis_title">Информации об этих отзывах пока нет</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Чтобы узнать, достоверны ли отзывы на этот продукт, проверьте качество отзывов. Это займет всего около 60 секунд.</string>
+    <string name="review_quality_check_no_analysis_body">Чтобы узнать, достоверны ли отзывы на этот продукт, проверьте качество отзывов. Это займет всего около 60 секунд.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Проверить качество отзывов</string>
+    <string name="review_quality_check_no_analysis_link">Проверить качество отзывов</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Оцените наше руководство по достоверности отзывов на продукты</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2347,11 +2372,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Открыть инструмент проверки отзывов</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Бета</string>
+    <string name="review_quality_check_beta_flag">Бета</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Открыть проверку качества отзывов</string>
+    <string name="review_quality_check_open_handle_content_description">Открыть проверку отзывов</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Закрыть проверку качества отзывов</string>
+    <string name="review_quality_check_close_handle_content_description">Закрыть проверку отзывов</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s из 5 звезд</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 528487ade..8e56705e7 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -14,7 +14,7 @@
     <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
     <string name="content_description_disable_private_browsing_button">පෞද්. පිරික්සීම අබල කරන්න</string>
     <!-- Placeholder text shown in the search bar before a user enters text for the default engine -->
-    <string name="search_hint">සොයන්න හෝ ලිපිනය යොදන්න</string>
+    <string name="search_hint">සොයන්න හෝ ලිපිනය ලියන්න</string>
     <!-- Placeholder text shown in the search bar before a user enters text for a general engine -->
     <string name="search_hint_general_engine">වියමනහි සොයන්න</string>
     <!-- Placeholder text shown in search bar when using history search -->
@@ -65,6 +65,19 @@
   පෞද්ගලික පිරික්සීම පිළිබඳව සුලබ මිථ්‍යා
   </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">මෙම උපාංගයේ කිසිදු හෝඩුවාවක් නොතබයි</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">ඔබ සියළුම පෞද්ගලික කවුළු වැසූ විට, %1$s ඔබගේ දත්තකඩ, ඉතිහාසය සහ අඩවිවල දත්ත මකා දමයි. %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">මාගේ ක්‍රියාකාරකම් දකින අය කවුරුන්ද?</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">එක් තට්ටුවකින් ඊළඟ පෞද්. පටිත්ත අරින්න.</string>
@@ -87,6 +100,12 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">පූර්ණ දත්තකඩ රැකවරණය ගැන දැනගන්න</string>
 
+
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">නැවුම් පෞද්ගලික වාරයක් ඇරඹීමට මෙතැන තට්ටු කරන්න. ඔබගේ ඉතිහාසය, දත්තකඩ — සියල්ල මකන්න.</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">රූගතයට ප්‍රවේශය අවශ්‍යයි. ඇන්ඩ්‍රොයිඩ් සැකසුම් වෙත ගොස්, අවසර මත තට්ටු කර ඉඩ දෙන්න තට්ටු කරන්න.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -217,6 +236,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">මුල් තිරය</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">පිරික්සුම් ඉතිහාසය මකන්න</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">තෝරාගත් භාෂාව</string>
@@ -295,19 +317,12 @@
     <string name="onboarding_home_enable_notifications_negative_button">දැන් නොවේ</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s පෙරනිමි අතිරික්සුව කරන්න</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">ෆයර්ෆොක්ස් ප්‍රධාන අතිරික්සුව කරන්න</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s සැමවිට ලාභයට ඉහළින් මිනිසුන්ව තබයි. හරස්-අඩවි ලුහුබැඳීම් අවහිර කර ඔබගේ පෞද්ගලිකත්‍වය රැක දෙයි.\n\nඅපගේ %2$s හරහා තව දැනගන්න.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">%1$s සැමවිට ලාභයට ඉහළින් මිනිසුන්ව තබයි. හරස්-අඩවි ලුහුබැඳීම් අවහිර කර ඔබගේ පෞද්ගලිකත්‍වය රැක දෙයි.\n\nඅපගේ පෞද්ගලිකත්‍ව දැන්වීම හරහා තව දැනගන්න.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus" 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>
@@ -318,20 +333,14 @@
     <!-- Title for sign in to sync screen. -->
     <string name="juno_onboarding_sign_in_title" tools:ignore="UnusedResources">දුරකථනයෙන් පරිගණකයට සහ ආපසු</string>
     <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">ඔබ නතර කළ තැනින් අතට ගැනීමට ඔබගේ අනෙකුත් උපාංගවලින් පටිති සහ මුරපද ගන්න.</string>
+    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">ඔබ නතර කළ තැනින් අතට ගැනීමට ඔබගේ අනෙකුත් උපාංගවල පටිති සහ මුරපද අරගන්න.</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">පිවිසෙන්න</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">දැන් නොවේ</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s සමඟ බොහෝ දෑ කිරීමට දැනුම්දීම් උපකාරී වේ</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">ෆයර්ෆොක්ස් සමඟ බොහෝ දෑ කිරීමට දැනුම්දීම් උපකාරී වේ</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">උපාංග අතර පටිති යැවීමට, බාගැනීම් කළමනාකරණයට මෙන්ම %s වෙතින් බොහෝ ප්‍රතිලාභ අත්විඳීම සඳහා ඉඟි ලබා ගන්න.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">උපාංග අතර පටිති යැවීමට, බාගැනීම් කළමනාකරණයට මෙන්ම ෆයර්ෆොක්ස් වෙතින් බොහෝ ප්‍රතිලාභ අත්විඳීම සඳහා ඉඟි ලබා ගන්න.</string>
@@ -340,6 +349,12 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">දැන් නොවේ</string>
 
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">ඔබගේ මුල් තිරයේ ෆයර්ෆොක්ස් ඇත්නම්, හරස්-අඩවි ලුහුබැඳීම් අවහිර කරන පෞද්ගලිකත්‍වයට මුල්තැන දෙන අතිරික්සුවට පහසුවෙන් ප්‍රවේශ වීමට හැකිය.</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">දැන් නොවේ</string>
+
     <!-- Search Widget -->
     <!-- Content description for searching with a widget. The first parameter is the name of the application.-->
     <string name="search_widget_content_description_2">නව %1$s පටිත්තක් අරින්න</string>
@@ -369,6 +384,8 @@
     <string name="preferences_default_search_engine">පෙරනිමි සෙවුම් යන්ත්‍රය</string>
     <!-- Preference for settings related to Search -->
     <string name="preferences_search">සොයන්න</string>
+    <!-- Preference for settings related to Search engines -->
+    <string name="preferences_search_engines">සෙවුම් යන්ත්‍ර</string>
     <!-- Preference for settings related to Search address bar -->
     <string name="preferences_search_address_bar">ලිපින තීරුව</string>
     <!-- Preference link to rating Fenix on the Play Store -->
@@ -471,11 +488,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">ප්‍රවේශ්‍යතාව</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">අභිරුචි ෆයර්ෆොක්ස් ගිණුම් සේවාදායකය</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">අභිරුචි ෆයර්ෆොක්ස් ගිණුම් සේවාදායකය</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>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">ෆයර්ෆොක්ස් ගිණුම/සමමුහුර්ත සේවාදායකය වෙනස් කර ඇත. වෙනස්කම් යෙදීමට යෙදුමෙන් ඉවත් වෙමින්…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">ෆයර්ෆොක්ස් ගිණුම/සමමුහුර්ත සේවාදායකය වෙනස් කර ඇත. වෙනස්කම් යෙදීමට යෙදුමෙන් ඉවත් වෙමින්…</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 -->
@@ -491,7 +512,9 @@
     <!-- 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">ෆයර්ෆොක්ස් ගිණුම</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">ෆයර්ෆොක්ස් ගිණුම</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 -->
@@ -522,6 +545,16 @@
     <string name="preferences_account_settings">ගිණුමේ සැකසුම්</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">ඒ.ස.නි. ස්වයං පිරවීම</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 -->
@@ -626,6 +659,17 @@
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
     <string name="addon_already_installed">එක්කහුව දැනටමත් ස්ථාපිතයි</string>
 
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">එක්කහුව තාවකාලිකව අබල කර ඇත</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">ඔබගේ පද්ධතිය අස්ථායී කරමින් එක්කහුවක් හෝ කිහිපයක් නතර විය. එක්කහු(ව) නැවත ආරම්භයට %1$s දැරූ උත්සාහය අසාර්ථක විය.\n\nඔබගේ වත්මන් වාරය අතරතුර එක්කහු නැවත ආරම්භ නොවනු ඇත.\n\nඑක්කහු(ව) ඉවත් හෝ අබල කිරීමෙන් මෙම ගැටලුව විසඳීමට හැකිය.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">එක්කහු යළි ආරම්භ කර බලන්න</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">එක්කහු අබල කර ඉදිරියට යන්න</string>
+
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">ගිණුම කළමනාකරණය</string>
@@ -670,7 +714,7 @@
     <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="fxa_received_tab_channel_name">ලැබුණු පටිති</string>
     <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
-    <string name="fxa_received_tab_channel_description">වෙනත් ෆයර්ෆොක්ස් උපාංගවලින් ලැබුණු පටිති සඳහා දැනුම්දීම්.</string>
+    <string name="fxa_received_tab_channel_description">වෙනත් ෆයර්ෆොක්ස් උපාංග වලින් ලැබුණු පටිති සඳහා දැනුම්දීම්.</string>
     <!--  The body for these is the URL of the tab received  -->
     <string name="fxa_tab_received_notification_name">පටිත්ත ලැබුණි</string>
     <!-- %s is the device name -->
@@ -1295,6 +1339,8 @@
     <string name="snackbar_private_tab_closed">පෞද්. පටිත්ත වැසිණි</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">පෞද්. පටිති වැසිණි</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">පෞද්. පිරික්සුම් දත්ත මැකිණි</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">පෙරසේ</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1343,12 +1389,16 @@
     <!-- Subtitle for the tabs item in Delete browsing data, parameter will be replaced with the number of open tabs -->
     <string name="preferences_delete_browsing_data_tabs_subtitle">පටිති %d</string>
     <!-- Title for the data and history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118">පිරික්සුම් ඉතිහාසය හා අඩවි දත්ත</string>
+    <string name="preferences_delete_browsing_data_browsing_data_title" moz:removedIn="118" tools:ignore="UnusedResources">පිරික්සුම් ඉතිහාසය හා අඩවි දත්ත</string>
+    <!-- Title for the history item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_browsing_history_title">පිරික්සුම් ඉතිහාසය</string>
     <!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">ලිපින %d</string>
     <!-- Title for the cookies item in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118">දත්තකඩ</string>
+    <string name="preferences_delete_browsing_data_cookies" moz:removedIn="118" tools:ignore="UnusedResources">දත්තකඩ</string>
+    <!-- Title for the cookies and site data items in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cookies_and_site_data">දත්තකඩ හා අඩවි දත්ත</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies_subtitle">ඔබව බොහෝ අඩවි වලින් නික්මවෙනු ඇත</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
@@ -1371,7 +1421,7 @@
     <!-- Title text of a delete browsing data dialog. -->
     <string name="delete_history_prompt_title">මකා දමන කාල පරාසය</string>
     <!-- Body text of a delete browsing data dialog. -->
-    <string name="delete_history_prompt_body" moz:RemovedIn="130" tools:ignore="UnusedResources">ඉතිහාසය (අන් උපාංග වලින් සමමුහූර්ත ඉතිහාසය ද), දත්තකඩ හා වෙනත් පිරික්සුම් දත්ත ඉවත් කරයි.</string>
+    <string name="delete_history_prompt_body" moz:RemovedIn="130" tools:ignore="UnusedResources">ඉතිහාසය (අනෙකුත් උපාංග වලින් සමමුහූර්ත ඉතිහාසය ද), දත්තකඩ හා වෙනත් පිරික්සුම් දත්ත ඉවත් කරයි.</string>
     <!-- Body text of a delete browsing data dialog. -->
     <string name="delete_history_prompt_body_2">ඉතිහාසය ඉවත් කරයි (අන් උපාංග වෙතින් සමමුහූර්ත දෑ ඇතුළුව)</string>
     <!-- Radio button in the delete browsing data dialog to delete history items for the last hour. -->
@@ -1389,7 +1439,7 @@
     <string name="delete_browsing_data_prompt_allow">මකන්න</string>
 
     <!-- Text for the snackbar confirmation that the data was deleted -->
-    <string name="preferences_delete_browsing_data_snackbar">පිරික්සීමේ දත්ත මැකිණි</string>
+    <string name="preferences_delete_browsing_data_snackbar">පිරික්සුම් දත්ත මැකිණි</string>
     <!-- Text for the snackbar to show the user that the deletion of browsing data is in progress -->
     <string name="deleting_browsing_data_in_progress">පිරික්සීමේ දත්ත මැකෙමින්…</string>
 
@@ -1475,7 +1525,7 @@
     <!-- Instructions on how to access pairing -->
     <string name="sign_in_instructions"><![CDATA[පරිගණකයෙහි ෆයර්ෆොක්ස් විවෘත කර <b>https://firefox.com/pair</b> වෙත යන්න]]></string>
     <!-- Text shown for sign in pairing when ready -->
-    <string name="sign_in_ready_for_scan">පරිලෝකනයට සූදානම්</string>
+    <string name="sign_in_ready_for_scan">පරිලෝකනයට ඔබන්න</string>
     <!-- Text shown for settings option for sign with pairing -->
     <string name="sign_in_with_camera">රූගතය සමඟ පිවිසෙන්න</string>
     <!-- Text shown for settings option for sign with email -->
@@ -1894,6 +1944,8 @@
     <string name="search_add_custom_engine_suggest_string_hint">සෙවුම් යෝජනා යෙ.ක්‍ර.මු. ඒ.ස.නි.</string>
     <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_suggest_string_example" formatted="false" moz:RemovedIn="118" tools:ignore="UnusedResources">“%s” සමඟ විමසුම ප්‍රතිස්ථාපනය කරන්න. නිදසුන:\nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">“%s” සමඟ විමසුම ප්‍රතිස්ථාපනය කරන්න. නිදසුන:\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">සුරකින්න</string>
 
@@ -1998,9 +2050,9 @@
     <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
     <string name="synced_tabs_enable_tab_syncing">පටිති සමමුහූර්තය සබල කරන්න.</string>
     <!-- Text displayed when user has no tabs that have been synced -->
-    <string name="synced_tabs_no_tabs">ඔබගේ අනෙකුත් උපාංගවල ෆයර්ෆොක්ස් හි පටිති කිසිවක් විවෘත කර නැත.</string>
+    <string name="synced_tabs_no_tabs">ඔබගේ අනෙකුත් උපාංගවල ෆයර්ෆොක්ස් පටිති කිසිවක් විවෘත කර නැත.</string>
     <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
-    <string name="synced_tabs_sign_in_message">ඔබගේ අනෙකුත් උපාංග වලින් පටිති ලේඛනයක් බලන්න.</string>
+    <string name="synced_tabs_sign_in_message">ඔබගේ අනෙකුත් උපාංගවල පටිති ලේඛනය බලන්න.</string>
     <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
     <string name="synced_tabs_sign_in_button">සමමුහූර්තයට පිවිසෙන්න</string>
     <!-- The text displayed when a synced device has no tabs to show in the list of Synced Tabs. -->
@@ -2063,7 +2115,7 @@
     <string name="other_default_search_engine_suggestion_header">%s සෙවුම</string>
 
     <!-- Default browser experiment -->
-    <string name="default_browser_experiment_card_text">ෆයර්ෆොක්ස් හි ස්වයංක්‍රීයව විවෘත වීමට අඩවි, වි-තැපැල් සහ පණිවිඩ වලින් සබැඳි සකසන්න.</string>
+    <string name="default_browser_experiment_card_text">ෆයර්ෆොක්ස් අතිරික්සුවේ ස්වයංක්‍රීයව විවෘත වීමට පණිවිඩ, වි-තැපැල් සහ අඩවිවල සබැඳි සකසන්න.</string>
 
     <!-- Content description for close button in collection placeholder. -->
     <string name="remove_home_collection_placeholder_content_description">ඉවත් කරන්න</string>
@@ -2096,6 +2148,91 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">සැකසුම් වෙත යන්න</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">සමාලෝචන සෝදිසිකරු</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">විශ්වසනීය සමාලෝචන</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">විශ්වසනීය සහ නොවන සමාලෝචන</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">අවිශ්වසනීය සමාලෝචන</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">මෙම සමාලෝචන කෙතරම් විශ්වසනීය ද?</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">අවිශ්වසනීය සමාලෝචන ඉවත් කර ඇත</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">සමාලෝචනයක ගුණත්‍වය තීරණය කරන්නේ කෙසේද?</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>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">සැකසුම්</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">සමාලෝචන සෝදිසිකරු මත දැන්වම් පෙන්වන්න </string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">තව දැනගන්න</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">සමාලෝචන සෝදිසිකරු අක්‍රිය කරන්න</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">පරීක්‍ෂා කරන්න</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">ප්‍රමාණවත් සමාලෝචන නැත</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">නිෂ්පාදනය නොතිබේ</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">සමාලෝචනයේ ගුණත්‍වය පරීක්‍ෂා වෙමින්</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">මෙයට තත්. 60 ක් පමණ ගත වනු ඇත.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">වාර්තා කිරීමට ස්තූතියි!</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">විශ්ලේෂණය යාවත්කාලීනයි</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">තේරුණා</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">දැනට තොරතුරු නැත</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">අපි ගැටලුව විසඳමින් සිටින්නෙමු. පසුව පරීක්‍ෂා කරන්න.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">ජාල සම්බන්ධතාවයක් නැත</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">ඔබගේ ජාල සම්බන්ධතාවය පරීක්‍ෂා කර පිටුව නැවත පූරණය කරන්න.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">මෙම සමාලෝචන ගැන තවමත් තොරතුරු නැත</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">තව දැනගන්න</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">පෞද්ගලිකත්‍ව ප්‍රතිපත්තිය</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">භාවිත නියම</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">ඔව්, උත්සාහ කරමු</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">දැන් නොවේ</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">මිලදී ගැනීමට පෙර — ඔබට මෙම නිෂ්පාදනයේ සමාලෝචන විශ්වාස කළ හැකිදැයි බලන්න.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">සමාලෝචන සෝදිසිකරු අරින්න</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">බීටා</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">සමාලෝචන සෝදිසිකරු අරින්න</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">සමාලෝචන සෝදිසිකරු වසන්න</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">තරු 5 න් %1$s</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">අඩුවෙන් පෙන්වන්න</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">තව පෙන්වන්න</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">ගුණත්‍වය</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">මිල</string>
+
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">ඇසුරුම්කරණය සහ පෙනුම</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">හැකිළීම</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 664c63292..42b83d83b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -329,16 +329,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Teraz nie</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Nastavte si %s ako svoj predvolený prehliadač</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Nastavte si Firefox ako svoj obľúbený prehliadač</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s uprednostňuje ľudí pred ziskami a chráni vaše súkromie blokovaním nástrojov tretích strán na sledovanie na stránkach.\n\nĎalšie informácie nájdete v našom %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox upredňostňuje ľudí pred ziskami a chráni vaše súkromie blokovaním sledovacích prvkov tretích strán.\n\nĎalšie informácie nájdete v našom Vyhlásení o ochrane osobných údajov.</string>
@@ -357,15 +350,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Prihlásiť sa</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Teraz nie</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Upozornenia vám pomôžu vyťažiť z prehliadača %s ešte viac</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Upozornenia vám pomôžu vyťažiť z prehliadača Firefox ešte viac</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Posielajte karty medzi zariadeniami, spravujte sťahovanie súborov a získajte tipy, ako prehliadač %s využiť čo najlepšie.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Posielajte karty medzi zariadeniami, spravujte sťahovanie súborov a získajte tipy, ako prehliadač Firefox využiť čo najlepšie.</string>
@@ -522,11 +509,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Zjednodušenie ovládania</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Vlastný server pre účet Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Vlastný server pre účet Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Vlastný server pre účet Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Vlastný server pre synchronizáciu</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Server pre účet Firefox alebo synchronizáciu bol zmenený. Pre použitie zmien sa teraz aplikácia ukončí…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Server pre účet Firefox alebo synchronizáciu bol zmenený. Pre použitie zmien sa teraz aplikácia ukončí…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Server pre účet Mozilla alebo synchronizáciu bol zmenený. Pre použitie zmien sa teraz aplikácia ukončí…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Účet</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -542,7 +533,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Prihláste sa a synchronizujte karty, záložky, heslá a ďalšie položky.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Účet Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Účet Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Účet Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Pre spustenie synchronizácie sa znova pripojte</string>
     <!-- Preference for language -->
@@ -554,7 +547,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Vzdialené ladenie cez USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Zobraziť vyhľadávače</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Zobraziť vyhľadávače</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Zobrazovať návrhy vyhľadávania</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -574,6 +567,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Automaticky dokončovať URL adresy</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Návrhy od sponzorov</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">Podporte %1$s príležitostnými sponzorovanými návrhmi</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">Návrhy od %1$su</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Získajte návrhy z webu súvisiace s vaším vyhľadávaním</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Otvárať odkazy v aplikáciách</string>
 
@@ -676,9 +679,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Doplnok nie je podporovaný</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Doplnok nie je podporovaný</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Doplnok je už nainštalovaný</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Doplnok je už nainštalovaný</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Doplnky sú dočasne zakázané</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Jeden alebo viac doplnkov prestal fungovať, čo spôsobilo, že váš systém je nestabilný. %1$s sa neúspešne pokúsil reštartovať tieto doplnky.\n\nDoplnky sa počas vašej aktuálnej relácie nereštartujú.\n\nTento problém môžete vyriešiť odstránením alebo zakázaním doplnkov.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Skúsiť reštartovať doplnky</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Pokračovať so zakázanými doplnkami</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -693,6 +706,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Spravovať účet</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Zmeňte svoje heslo, spravujte zhromažďovanie údajov alebo odstráňte svoj účet</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronizovať</string>
     <!-- Preference category for sync -->
@@ -1946,7 +1961,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Pridať</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Uložiť</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Uložiť</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Upraviť</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2196,7 +2211,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Kontrola recenzií</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Kontrola recenzií</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Kontrola recenzií</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Spoľahlivé recenzie</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2216,17 +2233,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Na kontrolu spoľahlivosti recenzií produktov používame AI technológiu %s od Mozilly. Analýza vám pomôže posúdiť kvalitu recenzie, nie kvalitu produktu.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Každej recenzii produktu prideľujeme <b>známku</b> od A po F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Každej recenzii produktu prideľujeme <b>známku</b> od A po F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Spoľahlivé recenzie. Veríme, že recenzie sú pravdepodobne od skutočných zákazníkov, ktorí zanechali úprimné a nezaujaté recenzie.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Veríme, že recenzie sú spoľahlivé.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Myslíme si, že je tu mix spoľahlivých a nespoľahlivých recenzií.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Nespoľahlivé recenzie. Sme presvedčení, že recenzie sú pravdepodobne falošné alebo od zaujatých recenzentov.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Myslíme si, že recenzie sú nespoľahlivé.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Upravené hodnotenie</b> je založené iba na recenziách, ktoré považujeme za spoľahlivé.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Najdôležitejšie informácie</b> pochádzajú z recenzií v obchode %s uverejnených za posledných 80 dní, ktoré považujeme za spoľahlivé.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Najdôležitejšie informácie</b> pochádzajú z recenzií v obchode %s uverejnených za posledných 80 dní, ktoré považujeme za spoľahlivé.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Ďalšie informácie o tom, %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2236,7 +2257,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Zobrazovať reklamy v nástroji Kontrola recenzií</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Príležitostne sa vám budú zobrazovať reklamy na relevantné produkty. Všetky reklamy musia spĺňať naše štandardy kvality recenzií. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Príležitostne sa vám budú zobrazovať reklamy na relevantné produkty. Všetky reklamy musia spĺňať naše štandardy kvality recenzií. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Príležitostne sa vám budú zobrazovať reklamy na relevantné produkty. Inzerujeme iba produkty so spoľahlivými recenziami. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Ďalšie informácie</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2256,29 +2279,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Skontrolovať teraz</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Zatiaľ nie je dostatok recenzií</string>
+    <string name="review_quality_check_no_reviews_warning_title">Zatiaľ nie je dostatok recenzií</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Keď bude mať tento produkt viac recenzií, budeme môcť skontrolovať ich kvalitu.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Keď bude mať tento produkt viac recenzií, budeme môcť skontrolovať ich kvalitu.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkt nie je dostupný</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Ak zistíte, že tento produkt je opäť na sklade, nahláste to a my budeme pracovať na kontrole recenzií.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Oznámiť, že tento produkt je opäť na sklade</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Oznámiť, že tento produkt je opäť na sklade</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Oznámiť, že produkt je na sklade</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontroluje sa kvalita recenzií</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontroluje sa kvalita recenzií</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontroluje sa kvalita recenzií</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontroluje sa kvalita recenzií</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Môže to trvať asi 60 sekúnd.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Môže to trvať asi 60 sekúnd.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Ďakujeme za nahlásenie!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Informácie o recenziách tohto produktu by sme mali mať do 24 hodín. Príďte sa pozrieť.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Tieto recenzie nemôžeme skontrolovať</string>
+    <string name="review_quality_check_not_analyzable_info_title">Tieto recenzie nemôžeme skontrolovať</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Bohužiaľ nemôžeme skontrolovať kvalitu recenzií určitých typov produktov. Napríklad darčekové karty alebo streamovanie videa, hudby a hier.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Bohužiaľ nemôžeme skontrolovať kvalitu recenzií určitých typov produktov. Napríklad darčekové karty alebo streamovanie videa, hudby a hier.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Informácie už čoskoro</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2288,20 +2313,20 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Rozumiem</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Momentálne nie sú dostupné žiadne informácie</string>
+    <string name="review_quality_check_generic_error_title">Momentálne nie sú dostupné žiadne informácie</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Pracujeme na vyriešení problému. Skúste sa vrátiť o trochu neskôr.</string>
+    <string name="review_quality_check_generic_error_body">Pracujeme na vyriešení problému. Skúste sa vrátiť o trochu neskôr.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Bez pripojenia k sieti</string>
+    <string name="review_quality_check_no_connection_title">Bez pripojenia k sieti</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Skontrolujte pripojenie k sieti a potom skúste stránku znova načítať.</string>
+    <string name="review_quality_check_no_connection_body">Skontrolujte pripojenie k sieti a potom skúste stránku znova načítať.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Zatiaľ žiadne informácie o týchto recenziách</string>
+    <string name="review_quality_check_no_analysis_title">Zatiaľ žiadne informácie o týchto recenziách</string>
 
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Ak chcete vedieť, či sú recenzie tohto produktu spoľahlivé, skontrolujte kvalitu recenzií. Trvá to len asi 60 sekúnd.</string>
+    <string name="review_quality_check_no_analysis_body">Ak chcete vedieť, či sú recenzie tohto produktu spoľahlivé, skontrolujte kvalitu recenzií. Trvá to len asi 60 sekúnd.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Skontrolovať kvalitu recenzií</string>
+    <string name="review_quality_check_no_analysis_link">Skontrolovať kvalitu recenzií</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Vyskúšajte nášho dôveryhodného sprievodcu recenziami produktov</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2329,11 +2354,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Otvoriť Kontrolu recenzií</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Otvoriť kontrolu kvality recenzií</string>
+    <string name="review_quality_check_open_handle_content_description">Otvoriť Kontrolu recenzií</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Zavrieť kontrolu kvality recenzií</string>
+    <string name="review_quality_check_close_handle_content_description">Zavrieť Kontrolu recenzií</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s z 5 hviezdičiek</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 001685857..ea9f6dc3e 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -67,6 +67,19 @@
        Pogoste zmote o zasebnem brskanju
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Ne pustite sledi na tej napravi</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">Ko zaprete vsa zasebna okna, %1$s izbriše piškotke, zgodovino in podatke o spletnih mestih. %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">Kdo bi lahko videl mojo dejavnost?</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">Odprite svoj naslednji zaseben zavihek z enim dotikom.</string>
@@ -89,6 +102,12 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Več o popolni zaščiti pred piškotki</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">Tapnite tukaj za začetek nove zasebne seje. Izbrišite zgodovino, piškotke – vse.</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">Potreben je dostop do kamere. Odprite nastavitve sistema Android in v dovoljenjih tapnite Dovoli.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -225,6 +244,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Domači zaslon</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">Počisti zgodovino brskanja</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Izbrani jezik</string>
@@ -302,16 +324,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ne zdaj</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Nastavite %s kot brskalnik za svoja vsakodnevna opravila</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Naj bo Firefox vaš brskalnik za vsakodnevna opravila</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s daje ljudem prednost pred dobičkom in ščiti vašo zasebnost, tako da zavrača medspletne sledilce.\n\nPreberite več v našem %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox daje ljudem prednost pred dobičkom in ščiti vašo zasebnost, tako da zavrača medspletne sledilce.\n\nPreberite več v našem obvestilu o zasebnosti.</string>
@@ -330,15 +345,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Prijava</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ne zdaj</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Obvestila vam pomagajo pri delu z aplikacijo %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Obvestila vam pomagajo pri delu s Firefoxom</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Pošiljajte zavihke med napravami, upravljajte prenose in prejemajte nasvete, kako kar najbolje izkoristiti %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Pošiljajte zavihke med napravami, upravljajte prenose in prejemajte nasvete, kako kar najbolje izkoristiti Firefox.</string>
@@ -347,6 +356,18 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Ne zdaj</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Preizkusite iskalnik Firefox</string>
+    <!-- Description for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_description" tools:ignore="UnusedResources">S Firefoxom na domačem zaslonu boste imeli hiter dostop do brskalnika, ki daje prednost zasebnosti in preprečuje sledilce med spletnimi mesti.</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Dodaj Firefox</string>
+    <!-- Text for the button to dismiss the screen and move on with the flow -->
+    <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Ne zdaj</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">Odpri nov zavihek v %1$su</string>
@@ -480,11 +501,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Dostopnost</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Strežnik Firefox računov po meri</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Strežnik Firefox računov po meri</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Strežnik računov Mozilla po meri</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Sinhronizacijski strežnik po meri</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Strežnik Firefox Računa/Synca je spremenjen. Zapiranje aplikacije za uveljavitev sprememb …</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Strežnik Firefox Računa/Synca je spremenjen. Zapiranje aplikacije za uveljavitev sprememb …</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Strežnik računa Mozilla/sinhronizacije je spremenjen. Zapiranje aplikacije za uveljavitev sprememb …</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Račun</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -500,7 +525,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Prijavite se in sinhronizirajte zavihke, zaznamke, gesla in še kaj.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox Račun</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Račun</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Račun Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Ponovno se povežite za nadaljevanje sinhronizacije</string>
     <!-- Preference for language -->
@@ -512,7 +539,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Oddaljeno razhroščevanje preko USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Prikaži iskalnike</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Prikaži iskalnike</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Prikaži predloge iskanja</string>
 
@@ -533,6 +560,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Samodokončaj spletne naslove</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Predlogi sponzorjev</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">Podprite %1$s z občasnimi sponzoriranimi predlogi</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">Predlogi aplikacije %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Prejemajte predloge s spleta, povezane z vašim iskanjem</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Odpiraj povezave v aplikacijah</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -634,9 +671,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Dodatek ni podprt</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Dodatek ni podprt</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Dodatek je že nameščen</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Dodatek je že nameščen</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Dodatki so začasno onemogočeni</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Eden ali več dodatkov je prenehal delovati, zaradi česar je sistem postal nestabilen. %1$s jih je poskušal znova zagnati, a ni uspel.\n\nMed trenutno sejo se dodatki ne bodo znova zagnali.\n\nTežavo lahko odpravite tako, da odstranite ali onemogočite dodatke.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Poskusi znova zagnati dodatke</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Nadaljuj z onemogočenimi dodatki</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -651,6 +698,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Upravljanje računa</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Spremenite geslo, upravljajte zbiranje podatkov ali izbrišite račun</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sinhroniziraj zdaj</string>
     <!-- Preference category for sync -->
@@ -1330,6 +1379,8 @@
     <string name="snackbar_private_tab_closed">Zasebni zavihek zaprt</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Zasebni zavihki zaprti</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Podatki zasebnega brskanja izbrisani</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">RAZVELJAVI</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1919,7 +1970,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Dodaj</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Shrani</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Shrani</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Uredi</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2171,6 +2222,173 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Pojdi v nastavitve</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Pregledovalnik mnenj</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Pregledovalnik mnenj</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Zanesljiva mnenja</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mešanica zanesljivih in nezanesljivih mnenj</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Nezanesljiva mnenja</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Kako zanesljiva so ta mnenja?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Prilagojena ocena</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Nezanesljiva mnenja odstranjena</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Poudarki iz nedavnih mnenj</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Kako določamo kakovost mnenj</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">Za preverjanje zanesljivosti mnenj o izdelkih uporabljamo tehnologijo umetne inteligence podjetja Mozilla %s. To vam bo pomagalo oceniti zgolj kakovost mnenja, ne pa tudi izdelka.</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Vsako mnenje o izdelku ocenimo s <b>črkovno oceno</b> od A do F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Zanesljiva mnenja. Verjamemo, da so jih napisale resnične stranke, ki so pustile poštene in nepristranske ocene.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Menimo, da so mnenja zanesljiva.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Menimo, da obstaja mešanica zanesljivih in nezanesljivih mnenj.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Nezanesljiva mnenja. Menimo, da so verjetno lažna ali pa so jih napisali pristranski ocenjevalci.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Menimo, da so mnenja nezanesljive.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Prilagojena ocena</b> temelji samo na mnenjih, za katere menimo, da so zanesljiva.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Poudarki</b> so vzeti iz mnenj v trgovini %s v zadnjih 80 dneh, za katera menimo, da so zanesljiva.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Več o %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">kako Mozille %s določa kakovost mnenj</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Nastavitve</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Prikaži oglase v pregledovalniku mnenj</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Občasno boste videli oglase za primerne izdelke. Vsi oglasi morajo izpolnjevati naše standarde kakovosti mnenj. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Občasno boste videli oglase za primerne izdelke. Oglašujemo samo izdelke z zanesljivimi mnenji. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Več o tem</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Izklopi pregledovalnik mnenj</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">Več za razmislek</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Oglas %sa</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Pregledovalnik mnenj uporablja tehnologijo %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Pregledovalnik mnenj uporablja tehnologijo %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">Mozilla %s</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Novi podatki za pregled</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Preveri zdaj</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Ni še dovolj mnenj</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">Ko bo za ta izdelek na voljo več mnenj, bomo lahko preverili njihovo kakovost.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Izdelek ni na voljo</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Če opazite, da je izdelek znova na zalogi, nam to sporočite in preverili bomo mnenja.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Sporoči, da je izdelek znova na zalogi</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Sporoči, da je izdelek znova na zalogi</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Preverjanje kakovosti mnenj</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Preverjanje kakovosti mnenj</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">To lahko traja približno 60 sekund.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Hvala za sporočilo!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Podatki o mnenjih za ta izdelek bi morali biti pripravljeni v 24 urah. Preverite znova kasneje.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">Teh mnenj ne moremo preveriti</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Za nekatere vrste izdelkov žal ne moremo preveriti kakovosti mnenj. Na primer za darilne kartice ter pretočne videe, glasbo in igre.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Kmalu bo na voljo še več vsebine</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">Podatki o mnenjih za ta izdelek bi morali biti pripravljeni v 24 urah. Preverite znova kasneje.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analiza je posodobljena</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Razumem</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">Trenutno ni na voljo nobenih podatkov</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Poskušamo odpraviti težavo. Preverite znova pozneje.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">Ni omrežne povezave</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Preverite omrežno povezavo in poskusite znova naložiti stran.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">O teh mnenjih še ni podatkov</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">Če želite preveriti, ali so ocene tega izdelka zanesljive, preverite kakovost mnenj. Traja le približno 60 sekund.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Preveri kakovost mnenj</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Preizkusite naš zaupanja vreden vodnik po ocenah izdelkov</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">Pred nakupom preverite, kako zanesljiva so mnenja o izdelkih v trgovini &lt;b&gt;%1$s&lt;/b&gt;. Pregledovalnik mnenj, preizkusna zmogljivost %2$sa, je vgrajen neposredno v brskalnik. Deluje tudi v trgovinah &lt;b&gt;%3$s&lt;/b&gt; in &lt;b&gt;%4$s&lt;/b&gt;.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Mozilla %1$s vam omogoča, da se izognete pristranskim in nepristnim mnenjem. Naš model umetne inteligence se nenehno izboljšuje, da vas ščiti med nakupovanjem. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">Več o tem</string>
+    <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_caption">Z izbiro “Da, poskusi” se strinjate z %2$s in %3$s Mozilla %1$s.</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">politiko zasebnosti</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">pogoji uporabe</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Da, poskusi</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Ne zdaj</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Pred nakupom se pozanimajte, ali lahko zaupate mnenjem o tem izdelku.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Preizkusite pregledovalnik mnenj</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Ali so ta mnenja zanesljiva? Preverite zdaj za ogled prilagojene ocene.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Odpri pregledovalnik mnenj</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Odpri pregledovalnik mnenj</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Zapri pregledovalnik mnenj</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s od 5 zvezdic</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Prikaži manj</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Prikaži več</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Kakovost</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Cena</string>
+
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Pošiljanje</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Embalaža in videz</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Konkurenčnost</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">strnete</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 704b41566..456a35d0c 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -329,16 +329,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Inte nu</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Gör %s till din favoritwebbläsare</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Gör Firefox till din favoritwebbläsare</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s sätter människor före vinster och försvarar din integritet genom att blockera spårare på flera webbplatser.\n\nLäs mer i vårt %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox sätter människor före vinster och försvarar din integritet genom att blockera spårare på flera webbplatser.\n\nLäs mer i vårt sekretessmeddelande.</string>
@@ -358,15 +351,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Logga in</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Inte nu</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Aviseringar hjälper dig att göra mer med %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Aviseringar hjälper dig att göra mer med Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Skicka flikar mellan enheter, hantera nedladdningar och få tips om hur du får ut det mesta av %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Skicka flikar mellan enheter, hantera nedladdningar och få tips om hur du får ut det mesta av Firefox.</string>
@@ -520,11 +507,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Hjälpmedel</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Anpassad server för Firefox-konto</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Anpassad server för Firefox-konto</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Anpassad Mozilla-kontoserver</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Anpassad synkroniseringsserver</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox-konto/synkroniseringsserver ändrad. Avsluta applikationen för att tillämpa ändringar…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto/synkroniseringsserver ändrad. Avsluta applikationen för att tillämpa ändringar…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla-konto/synkroniseringsserver har ändrats. Avslutar programmet för att tillämpa ändringar…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Konto</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -540,7 +531,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Logga in för att synkronisera flikar, bokmärken, lösenord och mer.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox-konto</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox-konto</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla-konto</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Anslut igen för att återuppta synkroniseringen</string>
     <!-- Preference for language -->
@@ -552,7 +545,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Fjärrfelsökning via USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Visa sökmotorer</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Visa sökmotorer</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Visa sökförslag</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -572,6 +565,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autokomplettera URL:ar</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Förslag från sponsorer</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">Stöd %1$s med enstaka sponsrade förslag</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">Förslag från %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Få förslag från webben relaterade till din sökning</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Öppna länkar i appar</string>
 
@@ -674,9 +677,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Tillägg stöds inte</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Tillägg stöds inte</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Tillägget är redan installerat</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Tillägget är redan installerat</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Tillägg är tillfälligt inaktiverade</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Ett eller flera tillägg slutade fungera, vilket gjorde ditt system instabilt. %1$s försökte inte starta om tillägget/tilläggen utan framgång.\n\nTillägg kommer inte att startas om under din nuvarande session.\n\nOm du tar bort eller inaktiverar tillägg kan det här problemet lösas.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Testa att starta om tillägg</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Fortsätt med tillägg inaktiverade</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -691,6 +704,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Hantera konto</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Ändra ditt lösenord, hantera datainsamling eller ta bort ditt konto</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synkronisera nu</string>
     <!-- Preference category for sync -->
@@ -1953,7 +1968,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Lägg till</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Spara</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Spara</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Redigera</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2203,8 +2218,10 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Recensionsgranskare</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Recensionsgranskare</string>
 
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Recensionsgranskare</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Pålitliga recensioner</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2224,17 +2241,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Vi använder AI-teknik från %s av Mozilla för att kontrollera pålitligheten av produktrecensioner. Detta hjälper dig bara att bedöma recensionens kvalitet, inte produktkvaliteten.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Vi tilldelar varje produkts recensioner ett <b>bokstavsbetyg</b> från A till F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Vi tilldelar varje produkts recensioner ett <b>bokstavsbetyg</b> från A till F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Pålitliga recensioner. Vi tror att recensionerna troligen kommer från riktiga kunder som lämnat ärliga, opartiska recensioner.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi anser att recensionerna är pålitliga.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Vi tror att det finns en blandning av pålitliga och opålitliga recensioner.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Opålitliga recensioner. Vi tror att recensionerna sannolikt är falska eller från partiska granskare.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Vi anser att recensionerna är opålitliga.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[Det <b>justerade betyget</b> baseras endast på recensioner som vi anser vara pålitliga.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Höjdpunkter</b> är från %s recensioner under de senaste 80 dagarna som vi tror är pålitliga.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Höjdpunkter</b> är från %s recensioner under de senaste 80 dagarna som vi tror är pålitliga.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Läs mer om %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2244,7 +2265,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Visa annonser i recensionsgranskaren</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Du ser då och då annonser för relevanta produkter. Alla annonser måste uppfylla våra kvalitetsstandarder för recensioner. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Du ser då och då annonser för relevanta produkter. Alla annonser måste uppfylla våra kvalitetsstandarder för recensioner. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Du ser då och då annonser för relevanta produkter. Vi annonserar endast produkter med pålitliga recensioner. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Läs mer</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2264,29 +2287,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Kontrollera nu</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Inte tillräckligt med recensioner ännu</string>
+    <string name="review_quality_check_no_reviews_warning_title">Inte tillräckligt med recensioner ännu</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">När den här produkten har fler recensioner kan vi kontrollera deras kvalitet.</string>
+    <string name="review_quality_check_no_reviews_warning_body">När den här produkten har fler recensioner kan vi kontrollera deras kvalitet.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Produkten är inte tillgänglig</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Om du ser att den här produkten finns i lager igen, rapportera det så jobbar vi med att kontrollera recensionerna.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Rapportera att denna produkt finns i lager igen</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Rapportera att denna produkt finns i lager igen</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Rapportera att produkten finns i lager</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrollerar recensionens kvalitet</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Kontrollerar recensionens kvalitet</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Kontrollerar recensionens kvalitet</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Kontrollerar recensionens kvalitet</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Detta kan ta uppåt 60 sekunder.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Detta kan ta uppåt 60 sekunder.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Tack för att du rapporterade!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Vi bör ha information om denna produkts recensioner inom 24 timmar. Kom tillbaka snart.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Vi kan inte kontrollera dessa recensioner</string>
+    <string name="review_quality_check_not_analyzable_info_title">Vi kan inte kontrollera dessa recensioner</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Tyvärr kan vi inte kontrollera recensionskvaliteten för vissa typer av produkter. Till exempel presentkort och strömmande video, musik och spel.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Tyvärr kan vi inte kontrollera recensionskvaliteten för vissa typer av produkter. Till exempel presentkort och strömmande video, musik och spel.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Info kommer snart</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2296,19 +2321,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Jag förstår</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Ingen information tillgänglig just nu</string>
+    <string name="review_quality_check_generic_error_title">Ingen information tillgänglig just nu</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Vi jobbar på att lösa problemet. Kom tillbaka snart.</string>
+    <string name="review_quality_check_generic_error_body">Vi jobbar på att lösa problemet. Kom tillbaka snart.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Ingen nätverksanslutning</string>
+    <string name="review_quality_check_no_connection_title">Ingen nätverksanslutning</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Kontrollera din nätverksanslutning och försök sedan ladda om sidan.</string>
+    <string name="review_quality_check_no_connection_body">Kontrollera din nätverksanslutning och försök sedan ladda om sidan.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Ingen information om dessa recensioner ännu</string>
+    <string name="review_quality_check_no_analysis_title">Ingen information om dessa recensioner ännu</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">För att veta om denna produkts recensioner är pålitliga, kontrollera recensionens kvalitet. Det tar bara cirka 60 sekunder.</string>
+    <string name="review_quality_check_no_analysis_body">För att veta om denna produkts recensioner är pålitliga, kontrollera recensionens kvalitet. Det tar bara cirka 60 sekunder.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Kontrollera recensionens kvalitet</string>
+    <string name="review_quality_check_no_analysis_link">Kontrollera recensionens kvalitet</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Prova vår pålitliga guide till produktrecensioner</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2336,11 +2361,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Öppna recensionsgranskaren</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Öppna recensionens kvalitetskontroll</string>
+    <string name="review_quality_check_open_handle_content_description">Öppna recensionsgranskaren</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Stäng recensionens kvalitetskontroll</string>
+    <string name="review_quality_check_close_handle_content_description">Stäng recensionsgranskaren</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s av 5 stjärnor</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 5f0cf01c8..19488d778 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -326,17 +326,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Ҳоло не</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">«%s»-ро ба браузери ҳамешагии худ табдил диҳед</string>
-
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">«Firefox»-ро ба браузери ҳамешагии худ табдил диҳед</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">«%1$s» одамгариро нисбат ба фоидаоварӣ ба ҷойи аввал мегузорад ва махфияти шуморо тавассути манъкунии пайгирикунандаҳои байнисомонавӣ муҳофизат мекунад.\n\nМаълумоти бештар дар «%2$s»-и мо дастрас аст.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">«Firefox» одамгариро нисбат ба фоидаоварӣ ба ҷойи аввал мегузорад ва махфияти шуморо тавассути манъкунии пайгирикунандаҳои байнисомонавӣ муҳофизат мекунад.\n\nМаълумоти бештар дар «Огоҳномаи махфият»-и мо дастрас аст.</string>
@@ -355,15 +347,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Ворид шудан</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Ҳоло не</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Огоҳиҳо барои кори бештар бо «%s» ба шумо кумак мекунанд</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Огоҳиҳо барои кори бештар бо «Firefox» ба шумо кумак мекунанд</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Варақаҳоро байни дастгоҳҳо интиқол диҳед, боргириҳоро идора кунед ва барои истифодаи бештари «%s» маслиҳат гиред.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Варақаҳоро байни дастгоҳҳо интиқол диҳед, боргириҳоро идора кунед ва барои истифодаи бештари «Firefox» маслиҳат гиред.</string>
@@ -518,11 +504,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Қобилияти дастрасӣ</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Сервери ҳисоби фармоишии Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Сервери ҳисоби фармоишии Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Сервери ҳисоби фармоишии «Mozilla»</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Сервери ҳамоҳангсозии фармоишӣ</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Сервери ҳисоб/ҳамоҳангсозии Firefox тағйир ёфт. Барои татбиқ кардани тағйирот барнома бояд хомӯш карда шавад…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Сервери ҳисоб/ҳамоҳангсозии Firefox тағйир ёфт. Барои татбиқ кардани тағйирот барнома бояд хомӯш карда шавад…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Сервери ҳисоб/ҳамоҳангсозии «Mozilla» тағйир ёфт. Барои татбиқ кардани тағйирот барнома бояд хомӯш карда шавад…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Ҳисоб</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -538,7 +528,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Барои ҳамоҳангсозии варақаҳо, хатбаракҳо, ниҳонвожаҳо ва чизҳои дигар, ворид шавед.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Ҳисоби Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Ҳисоби Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Барои барқарор кардани ҳамоҳангсозӣ аз нав пайваст шавед</string>
     <!-- Preference for language -->
@@ -550,7 +542,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Ислоҳкунии дурдасти хатоҳо тавассути USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Намоиш додани низомҳои ҷустуҷӯӣ</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Намоиш додани низомҳои ҷустуҷӯӣ</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 -->
@@ -569,6 +561,16 @@
     <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 -->
@@ -668,9 +670,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Ҷузъи иловагӣ дастгирӣ намешавад</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Ҷузъи иловагӣ дастгирӣ намешавад</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Ҷузъи иловагӣ аллакай насб карда шуд</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Ҷузъи иловагӣ аллакай насб карда шуд</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Ҷузъҳои иловагӣ муваққатан ғайрифаъол шудаанд</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Фаъолияти як ё якчанд ҷузъи иловагӣ қатъ карда шуд, ва ба ҳамин сабаб низоми шумо ноустувор кор мекунад. «%1$s» кӯшиш карда, ҷузъ(ҳо)и иловагиро аз нав оғоз карда натавонист.\n\nҶузъҳои иловагӣ ҳангоми фаъол будани ҷаласаи ҷорӣ аз нав оғоз карда намешаванд.\n\nЭҳтимол аст, ки агар шумо ҷузъҳои иловагиро тоза ё ғайрифаъол созед, ин мушкилӣ метавонад ҳал карда шавад.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Кӯшиш кунед, ки ҷузъҳои иловагиро аз нав оғоз намоед</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Идома додан бо ҷузъҳои иловагии ғайрифаъолшуда</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -685,6 +697,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Идоракунии ҳисобҳо</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Ниҳонвожаи худро иваз кунед, ҷамъоварии маълумотро идора намоед ё ҳисоби худро нест кунед</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Ҳозир ҳамоҳанг кунед</string>
     <!-- Preference category for sync -->
@@ -1947,7 +1961,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Илова кардан</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Нигоҳ доштан</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Нигоҳ доштан</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Таҳрир кардан</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2197,7 +2211,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Абзори тафтиши тақризҳо</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Абзори тафтиши тақризҳо</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Абзори тафтиши тақризҳо</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Тақризҳои боэътимод</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2217,17 +2233,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Барои тафтиши эътимоднокии тақризҳои маҳсулот мо аз технологияи зеҳни сунъӣ (AI) тавассути «%s» аз ҷониби «Mozilla» истифода мебарем. Ин ба шумо танҳо барои баҳодиҳии сифати тақризҳо кумак мерасонад, сифати маҳсулот тафтиш карда намешавад.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Мо ба тақризҳои ҳар як маҳсул <b>баҳои ҳарфиро</b> аз A то F таъин мекунем.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Мо ба тақризҳои ҳар як маҳсул <b>баҳои ҳарфиро</b> аз A то F таъин мекунем.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Тақризҳои боэътимод. Мо боварӣ дорем, ки тақризҳо аз муштариёни ҳақиқӣ ба таври ростқавл ва беғаразона пешниҳод карда шудаанд.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мо умедворем, ки тақризҳо боэътимоданд.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Мо боварӣ дорем, ки ҳозир будани маҷмӯи тақризҳои боэътимод ва беэътимод имконпазир аст.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Тақризҳои беэътимод. Мо боварӣ дорем, ки чунин тақризҳо аз тақризгарони қалбақӣ ва боғараз ворид карда шудаанд.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Мо умедворем, ки тақризҳо беэътимоданд.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Баҳодиҳии санҷида дурустшуда</b> танҳо дар он тақризҳое асос меёбад, ки ба умеди мо боэътимод мебошанд.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Нуқтаҳои асосӣ</b> аз тақризҳои «%s» ба хулоса омаданд, ки дар давоми 80 рӯзи охир ҷамъ карда шудаанд ва онҳо ба умеди мо боэътимод мебошанд.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Нуқтаҳои асосӣ</b> аз тақризҳои «%s» ба хулоса омаданд, ки дар давоми 80 рӯзи охир ҷамъ карда шудаанд ва онҳо ба умеди мо боэътимод мебошанд.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Маълумоти бештар дар бораи «%s».</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2237,7 +2257,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Намоиш додани реклама дар абзори тафтиши тақризҳо</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Баъзе вақт шумо рекламаи тасодуфиро барои маҳсулоти дахлдор мебинед. Тамоми реклама бояд ба стандартҳои сифати тақризҳои мо ҷавобгӯ бошад. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Баъзе вақт шумо рекламаи тасодуфиро барои маҳсулоти дахлдор мебинед. Тамоми реклама бояд ба стандартҳои сифати тақризҳои мо ҷавобгӯ бошад. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Шумо барои маҳсулоти муносиб рекламаи тасодуфиро мебинед. Мо танҳо он маҳсулотеро таблиғ мекунем, ки дорои тақризҳои боэътимод мебошад. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Маълумоти бештар</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2257,29 +2279,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Ҳозир тафтиш карда шавад</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ҳоло шумораи тақризҳо кофӣ намебошад</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ҳоло шумораи тақризҳо кофӣ намебошад</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Вақте ки ин маҳсул дорои тақризҳои сершумор мебошад, мо метавонем сифати он тақризҳоро тафтиш намоем.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Вақте ки ин маҳсул дорои тақризҳои сершумор мебошад, мо метавонем сифати он тақризҳоро тафтиш намоем.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Маҳсул дастнорас аст</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Агар шумо бинед, ки ин маҳсул аз нав дастрас бошад, гузориш диҳед ва мо тақризҳои онро тафтиш мекунем.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Гузориш диҳед, ки ин маҳсул аз нав дастрас аст</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Гузориш диҳед, ки ин маҳсул аз нав дастрас аст</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Огоҳ кунед, ки маҳсул дастрас аст</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Дар ҳоли санҷиши сифати тақризҳо</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Дар ҳоли санҷиши сифати тақризҳо</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Дар ҳоли санҷиши сифати тақризҳо</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Дар ҳоли санҷиши сифати тақризҳо</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Ин метавонад тахминан то 60 сония вақт гирад.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Ин метавонад тахминан то 60 сония вақт гирад.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Ташаккур барои гузориш!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Мо бояд дар муддати 24 соат дар бораи тақризҳои ин маҳсул маълумот гирем. Лутфан, аз нав дертар тафтиш кунед.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Мо ин тақризҳоро тафтиш карда наметавонем</string>
+    <string name="review_quality_check_not_analyzable_info_title">Мо ин тақризҳоро тафтиш карда наметавонем</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Мутаассифона, мо наметавонем сифати тақризҳоро барои баъзе намудҳои маҳсулот тафтиш кунем. Масалан, барои кортҳои ёдгорӣ, видеоҳои пахши мустақим, мусиқӣ ва бозиҳо.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Мутаассифона, мо наметавонем сифати тақризҳоро барои баъзе намудҳои маҳсулот тафтиш кунем. Масалан, барои кортҳои ёдгорӣ, видеоҳои пахши мустақим, мусиқӣ ва бозиҳо.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Маълумот ба наздикӣ дастрас мешавад</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2289,19 +2313,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Фаҳмидам</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Ҳоло ягон маълумот дастрас нест</string>
+    <string name="review_quality_check_generic_error_title">Ҳоло ягон маълумот дастрас нест</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Мо барои ҳал кардани ин масъала кор карда истодаем. Лутфан, дертар аз нав тафтиш кунед.</string>
+    <string name="review_quality_check_generic_error_body">Мо барои ҳал кардани ин масъала кор карда истодаем. Лутфан, дертар аз нав тафтиш кунед.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Пайвастшавӣ ба шабака нест</string>
+    <string name="review_quality_check_no_connection_title">Пайвастшавӣ ба шабака нест</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Пайвасти Интернетро санҷед ва пас аз чанд лаҳза саҳифаро аз нав бор кунед.</string>
+    <string name="review_quality_check_no_connection_body">Пайвасти Интернетро санҷед ва пас аз чанд лаҳза саҳифаро аз нав бор кунед.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">То ҳол дар бораи ин тақризҳо ягон маълумот нест</string>
+    <string name="review_quality_check_no_analysis_title">То ҳол дар бораи ин тақризҳо ягон маълумот нест</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Барои гирифтани маълумот дар бораи эътимоднокӣ нисбат ба тақризҳои ин маҳсул, сифати тақризҳоро аз назар гузаронед. Ин танҳо тахминан 60 сония вақти шуморо мегирад.</string>
+    <string name="review_quality_check_no_analysis_body">Барои гирифтани маълумот дар бораи эътимоднокӣ нисбат ба тақризҳои ин маҳсул, сифати тақризҳоро аз назар гузаронед. Ин танҳо тахминан 60 сония вақти шуморо мегирад.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Ҷанҷиши сифати тақризҳо</string>
+    <string name="review_quality_check_no_analysis_link">Ҷанҷиши сифати тақризҳо</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Дастури моро дар бораи эътимоднокӣ нисбат ба тақризҳои маҳсулот озмоед</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2329,11 +2353,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Кушодани абзори тафтиши тақризҳо</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Бета</string>
+    <string name="review_quality_check_beta_flag">Бета</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Кушодани тафтиши сифати тақризҳо</string>
+    <string name="review_quality_check_open_handle_content_description">Кушодани абзори тафтиши тақризҳо</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Пӯшидани тафтиши сифати тақризҳо</string>
+    <string name="review_quality_check_close_handle_content_description">Пӯшидани абзори тафтиши тақризҳо</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s аз 5 ситора</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 44bd46260..502962dbc 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -63,6 +63,19 @@
     <string name="private_browsing_placeholder_description_2">%1$s จะล้างประวัติการค้นหาและประวัติการเรียกดูของคุณจากแท็บส่วนตัวเมื่อคุณปิดแท็บเหล่านั้นหรือออกจากแอป แม้ว่าสิ่งนี้จะไม่ทำให้คุณไม่เปิดเผยตัวตนกับเว็บไซต์หรือผู้ให้บริการอินเทอร์เน็ตของคุณ แต่จะทำให้การรักษาความเป็นส่วนตัวของสิ่งที่คุณทำออนไลน์จากผู้อื่นที่ใช้อุปกรณ์เครื่องนี้ง่ายขึ้น</string>
     <string name="private_browsing_common_myths">ความเข้าใจผิดที่พบบ่อยเกี่ยวกับการท่องเว็บแบบส่วนตัว</string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">ไม่ทิ้งร่องรอยใดๆ บนอุปกรณ์นี้</string>
+    <!-- Explanation for private browsing displayed to users on home view when they first enable
+        private mode in our new Total Private Browsing mode.
+        The first parameter is the name of the app defined in app_name (for example: Firefox Nightly)
+        The second parameter is the clickable link text in felt_privacy_info_card_subtitle_link_text -->
+    <string name="felt_privacy_info_card_subtitle">%1$s จะลบคุกกี้ ประวัติ และข้อมูลไซต์ของคุณเมื่อคุณปิดหน้าต่างส่วนตัวของคุณทั้งหมด %2$s</string>
+    <!-- Clickable portion of the explanation for private browsing that links the user to our
+        about privacy page.
+        This string is used in felt_privacy_info_card_subtitle as the second parameter.-->
+    <string name="felt_privacy_info_card_subtitle_link_text">ใครบ้างที่สามารถเห็นกิจกรรมของฉันได้</string>
+
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the Private mode shortcut CFR message for adding a private mode shortcut to open private tabs from the Home screen -->
     <string name="private_mode_cfr_message_2">เปิดแท็บส่วนตัวถัดไปของคุณโดยแตะเพียงครั้งเดียว</string>
@@ -86,6 +99,11 @@
     <string name="tcp_cfr_learn_more">เรียนรู้เกี่ยวกับการป้องกันคุกกี้ทั้งหมด</string>
 
 
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">แตะที่นี่เพื่อเริ่มเปิดวาระส่วนตัวใหม่ โดยจะลบประวัติ คุกกี้ และทุกๆ อย่างของคุณเมื่อเสร็จแล้ว</string>
+
+
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">จำเป็นต้องมีการเข้าถึงกล้อง ไปที่การตั้งค่า Android แตะสิทธิอนุญาต แล้วแตะอนุญาต</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -223,6 +241,9 @@
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">หน้าแรก</string>
 
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">ล้างประวัติการเรียกดู</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ภาษาที่เลือก</string>
@@ -346,6 +367,12 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">ไม่ใช่ตอนนี้</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">ลองใช้วิดเจ็ตค้นหาของ Firefox</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">เพิ่มวิดเจ็ต Firefox</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">ไม่ใช่ตอนนี้</string>
 
@@ -643,6 +670,16 @@
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
     <string name="addon_already_installed">ส่วนเสริมถูกติดตั้งแล้ว</string>
 
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">ส่วนเสริมถูกปิดใช้งานชั่วคราว</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">มีส่วนเสริมอย่างน้อยหนึ่งตัวหยุดทำงาน ทำให้ระบบของคุณไม่เสถียร %1$s ลองเริ่มการทำงานของส่วนเสริมใหม่ไม่สำเร็จ\n\nส่วนเสริมจะไม่เริ่มทำงานใหม่ในระหว่างวาระปัจจุบันของคุณ\n\nการลบหรือปิดใช้งานส่วนเสริมอาจแก้ปัญหานี้ได้</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">ลองเริ่มการทำงานของส่วนเสริมใหม่</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">ไปต่อโดยปิดใช้งานส่วนเสริม</string>
+
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">จัดการบัญชี</string>
@@ -1314,6 +1351,8 @@
     <string name="snackbar_private_tab_closed">ปิดแท็บส่วนตัวแล้ว</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">ปิดแท็บส่วนตัวแล้ว</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">ลบข้อมูลการเรียกดูแบบส่วนตัวแล้ว</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">เลิกทำ</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -1928,6 +1967,8 @@
     <string name="search_add_custom_engine_suggest_string_hint">URL ของ API เสนอแนะการค้นหา</string>
     <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
     <string name="search_add_custom_engine_suggest_string_example" formatted="false" moz:RemovedIn="118" tools:ignore="UnusedResources">แทนที่คิวรีด้วย “%s” ตัวอย่าง:\nhttp://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
+    <!-- Description text for the Search Suggestion String TextField. The %s is part of the string -->
+    <string name="search_add_custom_engine_suggest_string_example_2" formatted="false">แทนที่คิวรีด้วย “%s” ตัวอย่าง:\nhttps://suggestqueries.google.com/complete/search?client=firefox&amp;q=%s</string>
     <!-- The text for the "Save" button for saving a custom search engine -->
     <string name="search_custom_engine_save_button">บันทึก</string>
 
@@ -2142,22 +2183,49 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">ไปยังการตั้งค่า</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">ตัวตรวจสอบบทวิจารณ์</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">บทวิจารณ์ที่น่าเชื่อถือ</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">บทวิจารณ์ที่น่าเชื่อถือและไม่น่าเชื่อถือปนกัน</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">บทวิจารณ์ที่ไม่น่าเชื่อถือ</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">บทวิจารณ์เหล่านี้น่าเชื่อถือแค่ไหน</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">คะแนนที่ปรับแล้ว</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">เอาบทวิจารณ์ที่ไม่น่าเชื่อถือออกแล้ว</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">วิธีที่เราพิจารณาคุณภาพบทวิจารณ์</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>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">การตั้งค่า</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">แสดงโฆษณาในตัวตรวจสอบบทวิจารณ์</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">เรียนรู้เพิ่ม</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">ปิดตัวตรวจสอบบทวิจารณ์</string>
     <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
     <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">โฆษณาโดย %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s โดย Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">ข้อมูลใหม่ที่ต้องตรวจสอบ</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">ตรวจสอบตอนนี้</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">ข้อมูลจะมาเร็ว ๆ นี้</string>
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">เข้าใจแล้ว</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">ไม่มีข้อมูลในขณะนี้</string>
+    <string name="review_quality_check_generic_error_title">ไม่มีข้อมูลในขณะนี้</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">ไม่มีการเชื่อมต่อเครือข่าย</string>
+    <string name="review_quality_check_no_connection_title">ไม่มีการเชื่อมต่อเครือข่าย</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">นโยบายความเป็นส่วนตัว</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
@@ -2168,6 +2236,8 @@
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">ไม่ใช่ตอนนี้</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
     <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s จาก 5 ดาว</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
     <string name="review_quality_check_highlights_show_less">แสดงน้อยลง</string>
     <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ef689336f..ae702cb58 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -66,6 +66,19 @@
        Gizli gezinti ile ilgili yaygın efsaneler
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Bu cihazda iz bırakmayın</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">%1$s, tüm gizli pencerelerinizi kapattığınızda çerezlerinizi, geçmişinizi ve site verilerinizi temizler. %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">Etkinliğimi kimler görebilir?</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">Bir sonraki gizli sekmenizi tek dokunuşla açın.</string>
@@ -307,16 +320,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Şimdi değil</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">%s varsayılan tarayıcınız olsun</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Firefox varsayılan tarayıcınız olsun</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s için paradan önce insanlık gelir. Siteler arası takip kodlarını engelleyerek gizliliğinizi koruyoruz.\n\nAyrıntıları %2$s bulabilirsiniz.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox için paradan önce insanlık gelir. Siteler arası takip kodlarını engelleyerek gizliliğinizi koruyoruz.\n\nAyrıntıları gizlilik bildirimimizde bulabilirsiniz.</string>
@@ -335,15 +341,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Giriş yap</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Şimdi değil</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Bildirimler sayesinde %s ile daha fazlasını yapın</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Bildirimler sayesinde Firefox ile daha fazlasını yapın</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Sekmelerinizi cihazdan cihaza gönderin, indirmelerinizi yönetin ve %s ile ilgili ipuçları alın.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Sekmelerinizi cihazdan cihaza gönderin, indirmelerinizi yönetin ve Firefox ile ilgili ipuçları alın.</string>
@@ -353,6 +353,12 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_enable_notifications_negative_button" tools:ignore="UnusedResources">Şimdi değil</string>
 
+    <!-- Title for add search widget screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Firefox arama widget’ını deneyin</string>
+    <!-- Text for the button to add search widget on the device used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_add_search_widget_positive_button" tools:ignore="UnusedResources">Firefox widget’ını ekle</string>
     <!-- Text for the button to dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_add_search_widget_negative_button" tools:ignore="UnusedResources">Şimdi değil</string>
 
@@ -489,11 +495,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Erişilebilirlik</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Özel Firefox Hesabı sunucusu</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Özel Firefox Hesabı sunucusu</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Özel Mozilla hesabı sunucusu</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Özel Sync sunucusu</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Firefox Hesabı/Sync sunucusu değiştirildi. Değişiklikleri uygulamak için uygulamadan çıkılıyor…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Hesabı/Sync sunucusu değiştirildi. Değişiklikleri uygulamak için uygulamadan çıkılıyor…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Mozilla hesabı/Sync sunucusu değiştirildi. Değişiklikleri uygulamak için uygulamadan çıkılıyor…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Hesap</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -509,7 +519,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Sekmeleri, yer imlerini, parolaları ve daha fazlasını eşitlemek için giriş yapın.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox Hesabı</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox Hesabı</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Mozilla hesabı</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Eşitlemeye devam etmek için yeniden bağlayın</string>
     <!-- Preference for language -->
@@ -521,7 +533,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB ile uzaktan hata ayıklama</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Arama motorlarını göster</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Arama motorlarını göster</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Arama önerilerini göster</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -541,6 +553,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Adresleri otomatik tamamla</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Sponsorlardan öneriler</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">Ara sıra görünecek sponsorlu önerilerle %1$s tarayıcınızı destekleyin</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 önerileri</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Aramanızla ilgili öneriler alın</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Bağlantıları uygulamalarda aç</string>
 
@@ -641,9 +663,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Eklenti desteklenmiyor</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Eklenti desteklenmiyor</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Eklenti zaten yüklenmiş</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Eklenti zaten yüklenmiş</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Eklentiler geçici olarak devre dışı bırakıldı</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Bir veya daha fazla eklenti çalışmayı durdurdu ve sisteminizi kararsız duruma getirdi. %1$s eklentileri yeniden başlatmayı denedi fakat başarısız oldu.\n\nEklentiler mevcut oturumunuz sırasında yeniden başlatılmayacak.\n\nEklentileri kaldırmak veya devre dışı bırakmak bu sorunu çözebilir.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Eklentileri yeniden başlatmayı dene</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Eklentileri devre dışı bırakarak devam et</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -658,6 +690,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Hesabı yönet</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Parolanızı değiştirin, veri toplamayı yönetin veya hesabınızı silin</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Şimdi eşitle</string>
     <!-- Preference category for sync -->
@@ -1914,7 +1948,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Ekle</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Kaydet</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Kaydet</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Düzenle</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2163,48 +2197,128 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Değerlendirme kontrolcüsü</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Değerlendirme kontrolcüsü</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Değerlendirme Kontrolcüsü</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Güvenilir değerlendirmeler</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Güvenilir ve güvenilmez değerlendirmelerin karışımı</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Güvenilmez değerlendirmeler</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">Bu değerlendirmeler ne kadar güvenilir?</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Güvenilmez değerlendirmeler kaldırıldı</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Öne çıkan son değerlendirmeler</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">Değerlendirme kalitesini nasıl belirliyoruz?</string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Her ürünün değerlendirmelerine A’dan F’ye kadar bir <b>harf notu</b> veriyoruz.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Güvenilir değerlendirmeler. Değerlendirmelerin büyük olasılıkla dürüst, tarafsız incelemeler yazan gerçek müşterilerden geldiğini düşünüyoruz.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Değerlendirmelerin güvenilir olduğunu düşünüyoruz.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">Güvenilir ve güvenilmez değerlendirmelerin bir karışımı olduğunu düşünüyoruz.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Güvenilmez değerlendirmeler. Değerlendirmelerin büyük ihtimalle sahte olduğunu veya önyargılı kişilerden geldiğini düşünüyoruz.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Değerlendirmelerin güvenilmez olduğunu düşünüyoruz.</string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">%s hakkında daha fazla bilgi alın.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">Mozilla %s değerlendirme kalitesini nasıl belirliyor?</string>
     <!-- Text for title of settings section. -->
     <string name="review_quality_check_settings_title">Ayarlar</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Değerlendirme denetleyicisinde reklamları göster</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Ara sıra ilgili ürünlerin reklamlarını görebilirsiniz. Tüm reklamlar değerlendirme kalitesi standartlarımızı karşılamak zorundadır. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Ara sıra ilgili ürünlerin reklamlarını görebilirsiniz. Yalnızca güvenilir değerlendirmeleri olan ürünlerin reklamlarını kabul ediyoruz. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Daha fazla bilgi alın</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
     <string name="review_quality_check_settings_turn_off">Değerlendirme kontrolcüsünü kapat</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">%s reklamı</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Değerlendirme kontrolcüsünün altyapısı %s tarafından sağlanmaktadır.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Değerlendirme kontrolcüsünün altyapısı %s tarafından sağlanmaktadır</string>
     <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">Mozilla’dan %s</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">Kontrol edilecek yeni bilgiler</string>
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Şimdi kontrol et</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Henüz yeterli değerlendirme yok</string>
+    <string name="review_quality_check_no_reviews_warning_title">Henüz yeterli değerlendirme yok</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Bu ürüne daha fazla değerlendirme geldiğinde değerlendirmelerin kalitelerini kontrol edebileceğiz.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Bu ürüne daha fazla değerlendirme geldiğinde değerlendirmelerin kalitelerini kontrol edebileceğiz.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Ürün mevcut değil</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Bu ürünün yeniden stoğa girdiğini görürseniz bize bildirin, biz de değerlendirmeleri kontrol etmeye çalışalım.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Bu ürünün tekrar stokta olduğunu bildir</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Ürünün stokta olduğunu bildir</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Değerlendirme kalitesi kontrol ediliyor</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Değerlendirme kalitesi kontrol ediliyor</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Değerlendirme kalitesi kontrol ediliyor</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Değerlendirme kalitesi kontrol ediliyor</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">Yaklaşık 60 saniye sürebilir.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Bildirdiğiniz için teşekkürler!</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Bu değerlendirmeleri kontrol edemiyoruz</string>
+    <string name="review_quality_check_not_analyzable_info_title">Bu değerlendirmeleri kontrol edemiyoruz</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Maalesef bazı ürün türlerinin değerlendirme kalitelerini kontrol edemiyoruz. Örneğin, hediye kartları ve video, müzik ve oyun akışı.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Bilgiler yakında gelecek</string>
     <!-- Title for info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analiz güncel</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Anladım</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Şu anda bilgi yok</string>
+    <string name="review_quality_check_generic_error_title">Şu anda bilgi yok</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">Sorunu çözmek için çalışıyoruz. Lütfen kısa süre sonra tekrar kontrol edin.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Ağ bağlantısı yok</string>
+    <string name="review_quality_check_no_connection_title">Ağ bağlantısı yok</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Ağ bağlantınızı kontrol edip sayfayı tazelemeyi deneyin.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Bu değerlendirmeler hakkında henüz bilgi yok</string>
+    <string name="review_quality_check_no_analysis_title">Bu değerlendirmeler hakkında henüz bilgi yok</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Değerlendirme kalitesini kontrol et</string>
+    <string name="review_quality_check_no_analysis_link">Değerlendirme kalitesini kontrol et</string>
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">Daha fazla bilgi alın</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
+    <string name="review_quality_check_contextual_onboarding_privacy_policy">gizlilik politikası</string>
+    <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
+    <string name="review_quality_check_contextual_onboarding_terms_use">kullanım koşulları</string>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Evet, deneyeceğim</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">Şimdi değil</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Satın almadan önce bu ürünün değerlendirmelerine güvenip güvenemeyeceğinizi öğrenin.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Değerlendirme kontrolcüsünü deneyin</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Değerlendirme kontrolcüsünü aç</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
 
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Değerlendirme kontrolcüsünü aç</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Değerlendirme kontrolcüsünü kapat</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">5 üzerinden %1$s yıldız</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index a25918d09..1a2158196 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -2,40 +2,65 @@
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
 
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_5">شەخسىي %s</string>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_4">%s (شەخسىي)</string>
+
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
-    <string name="content_description_menu">تېخىمۇ كۆپ تاللاش تۈرى</string>
-    <!-- Placeholder text shown in the search bar before a user enters text -->
-    <string name="search_hint">ئىزدەڭ ياكى تور ئادرېسىنى كىرگۈزۈپ زىيارەت قىلىڭ</string>
+    <string name="content_description_menu">تېخىمۇ كۆپ تاللانما</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_private_browsing_button">شەخسىي زىيارەتنى قوزغات</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_disable_private_browsing_button">شەخسىي زىيارەتنى چەكلە</string>
+    <!-- Placeholder text shown in the search bar before a user enters text for the default engine -->
+    <string name="search_hint">ئىزدەيدۇ ياكى ئادرېس كىرگۈزۈلىدۇ</string>
+    <!-- Placeholder text shown in the search bar before a user enters text for a general engine -->
+    <string name="search_hint_general_engine">توردىن ئىزدەيدۇ</string>
+    <!-- Placeholder text shown in search bar when using history search -->
+    <string name="history_search_hint">تارىختىن ئىزدەيدۇ</string>
+    <!-- Placeholder text shown in search bar when using bookmarks search -->
+    <string name="bookmark_search_hint">خەتكۈچ ئىزدەيدۇ</string>
+    <!-- Placeholder text shown in search bar when using tabs search -->
+    <string name="tab_search_hint">بەتكۈچ ئىزدەيدۇ</string>
+    <!-- Placeholder text shown in the search bar when using application search engines -->
+    <string name="application_search_hint">ئىزدەيدىغان ئاتالغۇ كىرگۈزۈلىدۇ</string>
+    <!-- No Open Tabs Message Description -->
+    <string name="no_open_tabs_description">ئوچۇق بەتكۈچلىرىڭىز بۇ يەردە كۆرۈنىدۇ.</string>
+    <!-- No Private Tabs Message Description -->
+    <string name="no_private_tabs_description">شەخسىي بەتكۈچلىرىڭىز بۇ يەردە كۆرۈنىدۇ.</string>
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d تاللاندى</string>
     <!-- Label of button in create collection dialog for creating a new collection  -->
-    <string name="tab_tray_add_new_collection">يېڭى ساقلانما قۇرۇش</string>
+    <string name="tab_tray_add_new_collection">يېڭى يىغقۇچ قۇر</string>
     <!-- Label of editable text in create collection dialog for naming a new collection  -->
-    <string name="tab_tray_add_new_collection_name">ساقلانما نامى</string>
+    <string name="tab_tray_add_new_collection_name">ئىسمى</string>
     <!-- Label of button in save to collection dialog for selecting a current collection  -->
-    <string name="tab_tray_select_collection">ساقلانمىنى تاللاش</string>
+    <string name="tab_tray_select_collection">يىغقۇچ تاللا</string>
     <!-- Content description for close button while in multiselect mode in tab tray -->
     <string name="tab_tray_close_multiselect_content_description">كۆپ تاللاش ھالىتىدىن چېكىنىش</string>
     <!-- Content description for save to collection button while in multiselect mode in tab tray -->
-    <string name="tab_tray_collection_button_multiselect_content_description">تاللانغان بەتكۈچلەرنى ساقلاڭ</string>
+    <string name="tab_tray_collection_button_multiselect_content_description">تاللانغان بەتكۈچلەرنى يىغقۇچقا ساقلايدۇ</string>
     <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
     <string name="tab_tray_multiselect_selected_content_description">تاللانغان</string>
 
 
     <!-- Home - Recently saved bookmarks -->
     <!-- Title for the home screen section with recently saved bookmarks. -->
-    <string name="recent_bookmarks_title">يېقىنقى خەتكۈچلەر</string>
+    <string name="recently_saved_title">يېقىنداق ساقلانغان</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string name="recently_saved_show_all_content_description_2">ساقلانغان بارلىق خەتكۈچنى كۆرسەت</string>
 
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s Mozilla ياسىغان.</string>
 
-    <!-- Text for the negative button -->
+    <!-- Text for the negative button to decline adding a Private Browsing shortcut to the Home screen -->
     <string name="cfr_neg_button_text">بولدى رەھمەت</string>
 
     <!-- Text for the negative action button -->
     <string name="open_in_app_cfr_negative_button_text">بولدىلا</string>
 
-    <!-- Content description for close button used in "contextual feature recommendation" (CFR) popups -->
-    <string name="cfr_dismiss_button_default_content_description">بولدىلا</string>
 
     <!-- Text for the negative action button to dismiss the dialog. -->
     <string name="camera_permissions_needed_negative_button_text">بولدىلا</string>
@@ -105,14 +130,11 @@
     <string name="search_suggestions_onboarding_allow_button">رۇخسەت بەر</string>
     <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
     <string name="search_suggestions_onboarding_do_not_allow_button">رۇخسەت بەرمە</string>
-    <!-- Search engine suggestion title text. The first parameter is the name of teh suggested engine-->
+    <!-- Search engine suggestion title text. The first parameter is the name of the suggested engine-->
     <string name="search_engine_suggestions_title">ئىزدەش%s</string>
     <!-- Menu option in the search selector menu to open the search settings -->
     <string name="search_settings_menu_item">ئىزدەش تەڭشىكى</string>
 
-    <!-- Onboarding home screen dialog description text for the history section. -->
-    <string name="onboarding_home_screen_section_useful_history_title_2">يېقىنقى ئىزدەشلەر</string>
-
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">ئىزدەش</string>
     <!-- Text preview for larger sized widgets -->
@@ -132,9 +154,8 @@
     <!-- Preference linking to about page for Fenix
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="preferences_about">ھەققىدە %1$s</string>
-    <!-- Summary of tracking protection preference if tracking protection is set to on -->
-    <string name="preferences_https_only_on">ئوچۇق</string>
-    <!-- Summary of tracking protection preference if tracking protection is set to off -->
+
+    <!-- Summary of https only preference if https only is set to off -->
     <string name="preferences_https_only_off">تاقاق</string>
     <!-- Text displayed that links to website containing documentation about "HTTPS-Only" mode -->
     <string name="preferences_http_only_learn_more">تەپسىلاتى</string>
@@ -217,17 +238,12 @@
 	<string name="remove_top_site">چىقىرىۋەت</string>
 
 
-    <!-- Title text for the normal tabs header in the tabs tray which are not part of any tab grouping. -->
-    <string moz:removedIn="104" name="tab_tray_header_title_1" tools:ignore="UnusedResources">باشقا بەتكۈچلەر</string>
-
     <!-- Text for the header that groups the history for today -->
     <string name="history_today">بۈگۈن</string>
     <!-- Text for the header that groups the history for yesterday -->
     <string name="history_yesterday">تۈنۈگۈن</string>
     <!-- Text for the header that groups the history older than the last month -->
     <string name="history_older">تېخىمۇ بۇرۇن</string>
-    <!-- The synced history sign in dialog button text -->
-    <string moz:removedIn="105" name="history_sign_in_button" tools:ignore="UnusedResources">كىرىش</string>
 
 
     <!-- Snackbar edit button shown after a bookmark has been created. -->
@@ -250,13 +266,8 @@
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">چېكىنىش</string>
 
-    <!-- Onboarding -->
-    <!-- Text for onboarding welcome message
-    The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_header"> %sگە خۇش كەپسىز!</string>
-
     <!-- Automatic theme setting (will follow device setting) -->
-    <string name="onboarding_theme_automatic_title">ئاپتوماتىك</string>
+    <string name="onboarding_theme_automatic_title" moz:RemovedIn="118" tools:ignore="UnusedResources">ئاپتوماتىك</string>
 
     <!-- Text displayed that links to website about enhanced tracking protection -->
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">تەپسىلاتى</string>
@@ -293,4 +304,5 @@
 
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">تەڭشەكنى ئاچ</string>
+
     </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 77f569872..3d4fbfafc 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -187,7 +187,7 @@
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">Додатки</string>
     <!-- Browser menu button that opens account settings -->
-    <string name="browser_menu_account_settings">Інформація про обліковий запис</string>
+    <string name="browser_menu_account_settings">Ваш обліковий запис</string>
     <!-- Text displayed when there are no add-ons to be shown -->
     <string name="no_add_ons">Немає додатків</string>
     <!-- Browser menu button that sends a user to help articles -->
@@ -325,17 +325,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Не зараз</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Зробіть %s своїм щоденним браузером</string>
-
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Зробіть Firefox своїм щоденним браузером</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s цінує людей понад прибуток і захищає вашу приватність, блокуючи стеження між сайтами.\n\nДізнайтеся більше у нашій %2$s.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox цінує людей понад прибуток і захищає вашу приватність, блокуючи стеження між сайтами.\n\nДізнайтеся більше у нашому положенні про приватність.</string>
@@ -354,15 +346,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Увійти</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Не зараз</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Сповіщення допомагають вам ефективніше взаємодіяти з %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Сповіщення допомагають вам ефективніше взаємодіяти з Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Надсилайте вкладки на інші пристрої, керуйте завантаженнями, а також отримуйте поради про можливості %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Надсилайте вкладки на інші пристрої, керуйте завантаженнями, а також отримуйте поради про можливості Firefox.</string>
@@ -519,11 +505,15 @@
     <string name="preferences_accessibility">Доступність</string>
 
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Власний сервер облікового запису Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Власний сервер облікового запису Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Власний сервер облікового запису Mozilla</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Спеціальний сервер синхронізації</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Сервер Облікового запису/Синхронізації Firefox змінено. Вихід з програми для застосування змін…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Сервер Облікового запису/Синхронізації Firefox змінено. Вихід з програми для застосування змін…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Сервер облікового запису/синхронізації Mozilla змінено. Вихід з програми для застосування змін…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Обліковий запис</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -539,7 +529,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Увійдіть для синхронізації вкладок, закладок, паролів та інших даних.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Обліковий запис Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Обліковий запис Firefox</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Повторно підключіться, щоб відновити синхронізацію</string>
     <!-- Preference for language -->
@@ -552,7 +544,7 @@
     <string name="preferences_remote_debugging">Віддалене налагодження через USB</string>
 
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Показати засоби пошуку</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Показати засоби пошуку</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Показувати пошукові пропозиції</string>
 
@@ -572,6 +564,16 @@
     <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>
 
@@ -673,9 +675,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Додаток не підтримується</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Додаток не підтримується</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Додаток вже встановлено</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Додаток вже встановлено</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Додаток тимчасово вимкнено</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Один або кілька додатків припинили роботу, внаслідок цього ваша система працює нестабільно. %1$s безуспішно намагався перезапустити додатки.\n\nДодатки не буде перезапущено під час вашого поточного сеансу.\n\nЦю проблему може усунути вилучення або вимкнення додатків.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Спробувати перезапустити додатки</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Продовжити з вимкненими додатками</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -690,6 +702,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Керувати обліковим записом</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Зміна пароля, керування збором даних або видалення облікового запису</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Синхронізувати</string>
     <!-- Preference category for sync -->
@@ -1950,7 +1964,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Додати</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Зберегти</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Зберегти</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Змінити</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2200,7 +2214,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Засіб перевірки відгуків</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Засіб перевірки відгуків</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Засіб перевірки відгуків</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Надійні відгуки</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2220,17 +2236,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Mozilla використовує технологію ШІ від %s, щоб перевірити надійність відгуків про товар. Це допоможе вам оцінити лише якість відгуку, а не якість товару.</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Кожному відгуку про товар ми присвоюємо <b>буквену оцінку</b> від A до F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Кожному відгуку про товар ми присвоюємо <b>буквену оцінку</b> від A до F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Надійні – чесні, неупереджені відгуки, найімовірніше від справжніх замовників.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Ми вважаємо ці відгуки надійними.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Ми вважаємо, що тут поєднано надійні та сумнівні відгуки.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Сумнівні – нечесні відгуки, найімовірніше від упереджених оглядачів.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Ми вважаємо ці відгуки ненадійними.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Скоригований рейтинг</b> на основі лише відгуків, які ми вважаємо надійними.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Обрані</b> беруться з відгуків %s за останні 80 днів, які ми вважаємо надійними.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Обрані</b> беруться з відгуків %s за останні 80 днів, які ми вважаємо надійними.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Дізнатися більше про %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2240,7 +2260,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Показувати рекламу в засобі перевірки</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Ви періодично бачитимете рекламу схожих товарів. Усі оголошення мають відповідати нашим стандартам якості відгуків. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Ви періодично бачитимете рекламу схожих товарів. Усі оголошення мають відповідати нашим стандартам якості відгуків. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Ви періодично бачитимете рекламу відповідних товарів. Ми рекламуємо лише товари з надійними відгуками. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Докладніше</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2260,29 +2282,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Перевірити зараз</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Ще недостатньо відгуків</string>
+    <string name="review_quality_check_no_reviews_warning_title">Ще недостатньо відгуків</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Коли на цей продукт буде більше відгуків, ми зможемо їх проаналізувати.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Коли на цей продукт буде більше відгуків, ми зможемо їх проаналізувати.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Товар відсутній</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Якщо цей товар знову з’явиться, повідомте про це нам, і ми його проаналізуємо.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Повідомити, що цей товар знову в наявності</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Повідомити, що цей товар знову в наявності</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Повідомити про наявність товару</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Перевірка якості відгуку</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Перевірка якості відгуку</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Перевірка якості відгуку</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Перевірка якості відгуку</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Це може тривати близько 60 секунд.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Це може тривати близько 60 секунд.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Дякуємо за повідомлення!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Оновлені результати мають з’явитися впродовж 24 годин. Перевірте знову пізніше.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Ми не можемо перевірити ці відгуки</string>
+    <string name="review_quality_check_not_analyzable_info_title">Ми не можемо перевірити ці відгуки</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">На жаль, ми не можемо перевірити якість відгуків для певних типів товарів, як-от: подарункових карток, стримінгових відео, музики й ігор.</string>
+    <string name="review_quality_check_not_analyzable_info_body">На жаль, ми не можемо перевірити якість відгуків для певних типів товарів, як-от: подарункових карток, стримінгових відео, музики й ігор.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Інформація незабаром надійде</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2292,19 +2316,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Зрозуміло</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Наразі інформація недоступна</string>
+    <string name="review_quality_check_generic_error_title">Наразі інформація недоступна</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Ми працюємо над усуненням проблеми. Поверніться згодом.</string>
+    <string name="review_quality_check_generic_error_body">Ми працюємо над усуненням проблеми. Поверніться згодом.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Немає зʼєднання з мережею</string>
+    <string name="review_quality_check_no_connection_title">Немає зʼєднання з мережею</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Перевірте зʼєднання з мережею, а потім спробуйте перезавантажити сторінку.</string>
+    <string name="review_quality_check_no_connection_body">Перевірте зʼєднання з мережею, а потім спробуйте перезавантажити сторінку.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Ще немає інформації про ці відгуки</string>
+    <string name="review_quality_check_no_analysis_title">Ще немає інформації про ці відгуки</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Щоб дізнатися, чи надійні відгуки про цей товар, перевірте їхню якість. Це триватиме лише близько 60 секунд.</string>
+    <string name="review_quality_check_no_analysis_body">Щоб дізнатися, чи надійні відгуки про цей товар, перевірте їхню якість. Це триватиме лише близько 60 секунд.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Перевірити якість відгуку</string>
+    <string name="review_quality_check_no_analysis_link">Перевірити якість відгуку</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Спробуйте наш надійний путівник відгуками про товари</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2333,11 +2357,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Відкрити засіб перевірки відгуків</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Бета</string>
+    <string name="review_quality_check_beta_flag">Бета</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Відкрити перевірку якості відгуків</string>
+    <string name="review_quality_check_open_handle_content_description">Відкрити засіб перевірки відгуків</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Закрити перевірку якості відгуків</string>
+    <string name="review_quality_check_close_handle_content_description">Закрити засіб перевірки відгуків</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s із 5 зірок</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f0bfbc464..55874ca54 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -322,16 +322,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">Không phải bây giờ</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Đặt %s làm trình duyệt mặc định của bạn</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Đặt Firefox làm trình duyệt của bạn</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s đặt mọi người lên trên lợi nhuận và bảo vệ quyền riêng tư của bạn bằng cách chặn các trình theo dõi trên nhiều trang web.\n\nTìm hiểu thêm trong %2$s của chúng tôi.</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox đặt mọi người lên trên lợi nhuận và bảo vệ quyền riêng tư của bạn bằng cách chặn các trình theo dõi trên nhiều trang web.\n\nTìm hiểu thêm trong thông báo về quyền riêng tư của chúng tôi.</string>
@@ -350,15 +343,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Đăng nhập</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Không phải bây giờ</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">Thông báo giúp bạn làm được nhiều việc hơn với %s</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Thông báo giúp bạn làm được nhiều việc hơn với Firefox</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">Gửi các thẻ giữa các thiết bị, quản lý tải xuống và nhận các mẹo để tận dụng tối đa %s.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Gửi các thẻ giữa các thiết bị, quản lý tải xuống và nhận các mẹo để tận dụng tối đa Firefox.</string>
@@ -512,11 +499,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Khả năng truy cập</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">Tùy chỉnh máy chủ tài khoản Firefox</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">Tùy chỉnh máy chủ tài khoản Firefox</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">Máy chủ tài khoản Mozilla tùy chỉnh</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Tùy chỉnh máy chủ đồng bộ hóa</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">Tài khoản máy chủ Firefox/đồng bộ hóa đã thay đổi. Thoát ứng dụng để áp dụng thay đổi…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">Tài khoản máy chủ Firefox/đồng bộ hóa đã thay đổi. Thoát ứng dụng để áp dụng thay đổi…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">Đã sửa đổi máy chủ/tài khoản đồng bộ hóa Mozilla. Đang thoát khỏi ứng dụng để áp dụng các thay đổi…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">Tài khoản</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -532,7 +523,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">Đăng nhập để đồng bộ các thẻ, dấu trang, mật khẩu, v.v.</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Tài khoản Firefox</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Tài khoản Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name_2">Tài khoản Mozilla</string>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">Kết nối lại để tiếp tục đồng bộ hóa</string>
     <!-- Preference for language -->
@@ -544,7 +537,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Gỡ lỗi từ xa qua USB</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">Hiển thị công cụ tìm kiếm</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">Hiển thị công cụ tìm kiếm</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Hiển thị đề xuất tìm kiếm</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -563,6 +556,16 @@
     <string name="preferences_account_settings">Cài đặt tài khoản</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Tự động điền URL</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Đề xuất từ nhà tài trợ</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">Hỗ trợ %1$s với các đề xuất được tài trợ không thường xuyên</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">Đề xuất từ %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Nhận đề xuất từ ​​web liên quan đến tìm kiếm của bạn</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Mở liên kết trong ứng dụng</string>
 
@@ -663,9 +666,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">Tiện ích mở rộng không được hỗ trợ</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">Tiện ích mở rộng không được hỗ trợ</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">Tiện ích mở rộng đã được cài đặt trước đó</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">Tiện ích mở rộng đã được cài đặt trước đó</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">Tiện ích mở rộng tạm thời bị vô hiệu hóa</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">Một hoặc nhiều tiện ích mở rộng ngừng hoạt động khiến hệ thống của bạn không ổn định. %1$s thất bại khi thử khởi động lại (các) tiện ích.\n\nTiện ích mở rộng sẽ không được khởi động lại trong phiên hiện tại của bạn.\n\nXóa hoặc vô hiệu hóa các tiện ích có thể khắc phục được sự cố này.</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Thử khởi động lại tiện ích</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">Tiếp tục với tiện ích bị vô hiệu hóa</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -680,6 +693,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">Quản lý tài khoản</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">Thay đổi mật khẩu, quản lý việc thu thập dữ liệu hoặc xóa tài khoản của bạn</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Đồng bộ ngay</string>
     <!-- Preference category for sync -->
@@ -1925,7 +1940,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">Thêm</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">Lưu</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Lưu</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">Chỉnh sửa</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2174,7 +2189,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">Trình kiểm tra đánh giá</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Trình kiểm tra đánh giá</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">Trình kiểm tra đánh giá</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">Đánh giá đáng tin cậy</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2194,17 +2211,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">Chúng tôi sử dụng công nghệ AI từ %s bởi Mozilla để kiểm tra độ tin cậy của các đánh giá sản phẩm. Điều này chỉ giúp bạn đánh giá được chất lượng đánh giá chứ không phải chất lượng sản phẩm. </string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[Chúng tôi đưa ra đánh giá cho từng sản phẩm một <b>điểm bằng chữ cái</b> từ A đến F.]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[Chúng tôi đưa ra đánh giá cho từng sản phẩm một <b>điểm bằng chữ cái</b> từ A đến F.]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">Đánh giá đáng tin cậy. Chúng tôi tin rằng các đánh giá có thể đến từ những khách hàng thực sự đã để lại những đánh giá trung thực, không thiên vị.</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Chúng tôi tin rằng các đánh giá là đáng tin cậy.</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">Chúng tôi tin rằng có sự kết hợp giữa các đánh giá đáng tin cậy và không đáng tin cậy.</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">Đánh giá không đáng tin cậy. Chúng tôi tin rằng các đánh giá có thể là giả mạo hoặc từ những người đánh giá thiên vị.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">Chúng tôi tin rằng các đánh giá là không đáng tin cậy.</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>Đánh giá đã được điều chỉnh</b> chỉ dựa trên những đánh giá mà chúng tôi tin là đáng tin cậy.]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Điểm nổi bật</b> từ %s đánh giá trong vòng 80 ngày qua mà chúng tôi tin là đáng tin cậy.]]></string>
+    <string name="review_quality_check_explanation_body_highlights"><![CDATA[<b>Điểm nổi bật</b> từ %s đánh giá trong vòng 80 ngày qua mà chúng tôi tin là đáng tin cậy.]]></string>
     <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
     <string name="review_quality_check_info_learn_more">Tìm hiểu thêm về %s.</string>
     <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
@@ -2214,7 +2235,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">Hiển thị quảng cáo trong trình kiểm tra đánh giá</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">Bạn sẽ thấy quảng cáo không thường xuyên cho các sản phẩm có liên quan. Tất cả quảng cáo phải đáp ứng tiêu chuẩn chất lượng đánh giá của chúng tôi. %s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">Bạn sẽ thấy quảng cáo không thường xuyên cho các sản phẩm có liên quan. Tất cả quảng cáo phải đáp ứng tiêu chuẩn chất lượng đánh giá của chúng tôi. %s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">Bạn sẽ thấy quảng cáo không thường xuyên cho các sản phẩm có liên quan. Chúng tôi chỉ quảng cáo những sản phẩm có đánh giá đáng tin cậy. %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Tìm hiểu thêm</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2234,29 +2257,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Kiểm tra ngay</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">Chưa đủ đánh giá</string>
+    <string name="review_quality_check_no_reviews_warning_title">Chưa đủ đánh giá</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">Khi sản phẩm này có nhiều đánh giá hơn, chúng tôi sẽ có thể kiểm tra chất lượng của chúng.</string>
+    <string name="review_quality_check_no_reviews_warning_body">Khi sản phẩm này có nhiều đánh giá hơn, chúng tôi sẽ có thể kiểm tra chất lượng của chúng.</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Sản phẩm không có sẵn</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">Nếu bạn thấy sản phẩm này đã có hàng trở lại, hãy báo cáo và chúng tôi sẽ kiểm tra đánh giá.</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Báo sản phẩm này đã có hàng trở lại</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">Báo sản phẩm này đã có hàng trở lại</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">Báo sản phẩm còn hàng</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">Đang kiểm tra chất lượng đánh giá</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Đang kiểm tra chất lượng đánh giá</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">Đang kiểm tra chất lượng đánh giá</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">Đang kiểm tra chất lượng đánh giá</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">Quá trình này có thể mất khoảng 60 giây.</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">Quá trình này có thể mất khoảng 60 giây.</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Cảm ơn bạn đã báo cáo!</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">Chúng tôi sẽ có thông tin về đánh giá của sản phẩm này trong vòng 24 giờ. Hãy kiểm tra lại sau.</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">Chúng tôi không thể kiểm tra những đánh giá này</string>
+    <string name="review_quality_check_not_analyzable_info_title">Chúng tôi không thể kiểm tra những đánh giá này</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">Rất tiếc, chúng tôi không thể kiểm tra chất lượng đánh giá đối với một số loại sản phẩm nhất định. Ví dụ: thẻ quà tặng và truyền phát video, âm nhạc và trò chơi.</string>
+    <string name="review_quality_check_not_analyzable_info_body">Rất tiếc, chúng tôi không thể kiểm tra chất lượng đánh giá đối với một số loại sản phẩm nhất định. Ví dụ: thẻ quà tặng và truyền phát video, âm nhạc và trò chơi.</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Thông tin sắp ra mắt</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2266,19 +2291,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Đã hiểu</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">Hiện không có thông tin nào</string>
+    <string name="review_quality_check_generic_error_title">Hiện không có thông tin nào</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">Chúng tôi đang làm việc để giải quyết sự cố. Hãy kiểm tra lại sau.</string>
+    <string name="review_quality_check_generic_error_body">Chúng tôi đang làm việc để giải quyết sự cố. Hãy kiểm tra lại sau.</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">Không có kết nối mạng</string>
+    <string name="review_quality_check_no_connection_title">Không có kết nối mạng</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">Hãy kiểm tra kết nối mạng của bạn rồi thử tải lại trang.</string>
+    <string name="review_quality_check_no_connection_body">Hãy kiểm tra kết nối mạng của bạn rồi thử tải lại trang.</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">Chưa có thông tin về những đánh giá này</string>
+    <string name="review_quality_check_no_analysis_title">Chưa có thông tin về những đánh giá này</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">Để biết liệu đánh giá của sản phẩm này có đáng tin cậy hay không, hãy kiểm tra chất lượng đánh giá. Chỉ mất khoảng 60 giây.</string>
+    <string name="review_quality_check_no_analysis_body">Để biết liệu đánh giá của sản phẩm này có đáng tin cậy hay không, hãy kiểm tra chất lượng đánh giá. Chỉ mất khoảng 60 giây.</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">Kiểm tra chất lượng đánh giá</string>
+    <string name="review_quality_check_no_analysis_link">Kiểm tra chất lượng đánh giá</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">Hãy thử hướng dẫn đáng tin cậy của chúng tôi để đánh giá sản phẩm</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2306,11 +2331,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Mở trình kiểm tra đánh giá</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <string name="review_quality_check_beta_flag">Beta</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">Mở Kiểm tra chất lượng đánh giá</string>
+    <string name="review_quality_check_open_handle_content_description">Mở trình kiểm tra đánh giá</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">Đóng Kiểm tra chất lượng đánh giá</string>
+    <string name="review_quality_check_close_handle_content_description">Đóng trình kiểm tra đánh giá</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s trên tổng số 5 sao</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ff4fc78a..aebff2f6a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -333,16 +333,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">暂时不要</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">将 %s 设为主力浏览器。</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">将 Firefox 设为主力浏览器</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s 始终以人为本，并通过拦截跨站跟踪器等机制保护您的隐私。\n\n可阅读我们的%2$s详细了解 </string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox 始终以人为本，并通过拦截跨站跟踪器等机制保护您的隐私。\n\n可阅读我们的隐私声明详细了解 </string>
@@ -361,15 +354,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">登录</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">暂时不要</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">允许通知可以让 %s 更贴心好用</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">允许通知可以让 Firefox 更贴心好用</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">在设备之间传输标签页、管理下载，解锁 %s 完整体验。</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">在设备之间传输标签页、管理下载，解锁 Firefox 完整体验。</string>
@@ -527,11 +514,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">无障碍环境</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">自定义 Firefox 账户服务器</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">自定义 Firefox 账户服务器</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">自定义 Mozilla 账户服务器</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">自定义同步服务器</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">已更改 Firefox 账户/同步服务器设置。退出应用程序以应用更改…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">已更改 Firefox 账户/同步服务器设置。退出应用程序以应用更改…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">已更改 Mozilla 账户/同步服务器设置。正在退出应用程序以应用更改…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">账户</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -547,7 +538,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">登录后即可同步标签页、书签、密码等数据。</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox 账户</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox 账户</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">重新连接以恢复同步</string>
     <!-- Preference for language -->
@@ -579,6 +572,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">自动补全网址</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>
 
@@ -681,9 +684,20 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">不支持的附加组件</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">不支持的附加组件</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">附加组件已安装</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">附加组件已安装</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">附加组件已暂时被禁用</string>
+
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">一个或多个附加组件已停止运行，影响系统稳定。%1$s 曾尝试重启附加组件，但未能起效。\n\n当前会话中将不会再重启附加组件。\n\n移除或禁用附加组件也许可以解决此问题。</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">尝试重启附加组件</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">禁用附加组件并继续</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -699,6 +713,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">管理账户</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">更改密码、管理数据收集、或删除账户</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">立即同步</string>
     <!-- Preference category for sync -->
@@ -2165,7 +2181,7 @@
     <!-- Text for the menu button to navigate to sponsors and privacy support articles. '&amp;' is replaced with the ampersand symbol: & -->
     <string name="top_sites_menu_sponsor_privacy">我们的赞助商＆您的隐私</string>
     <!-- Label text displayed for a sponsored top site. -->
-    <string name="top_sites_sponsored_label">赞助项目</string>
+    <string name="top_sites_sponsored_label">赞助推广</string>
 
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
@@ -2228,7 +2244,7 @@
     <string name="pocket_stories_feature_learn_more">详细了解</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">赞助项目</string>
+    <string name="pocket_stories_sponsor_indication">赞助推广</string>
 
     <!-- Snackbar message for enrolling in a Nimbus experiment from the secret settings when Studies preference is Off.-->
     <string name="experiments_snackbar">启用遥测以发送数据。</string>
@@ -2257,18 +2273,22 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">我们使用由 Mozilla 支持的 %s 的人工智能技术来分析商品评价的可信度。分析结果只能辅助您评估评价的质量，不能反映商品质量。</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[我们会以<b>字母等级</b>（从 A 到 F）给商品评价打分。]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[我们会以<b>字母等级</b>（从 A 到 F）给商品评价打分。]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">评价可信。分析认为这些评价大概率是由真实消费者作出的诚实公正的评价。</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">分析认为这些评价真实可信。</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">分析认为对此商品的评价鱼龙混杂。</string>
 
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">评价不可信。分析认为这些评价大概率不实，或是由“水军”所作出。</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">分析认为这些评价不可信。</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[<b>调整后的评分</b>仅基于我们认为可信的评价作出。]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>最有帮助的评价</b>选自我们认为可信的最近 80 天内的 %s 评价。]]></string>
+    <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. -->
@@ -2300,35 +2320,35 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">马上了解</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">还没有足够数量的评价</string>
+    <string name="review_quality_check_no_reviews_warning_title">还没有足够数量的评价</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">此商品获得更多评价后，我们就能开始分析其评价的质量。</string>
+    <string name="review_quality_check_no_reviews_warning_body">此商品获得更多评价后，我们就能开始分析其评价的质量。</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">商品无货</string>
 
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
-    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">若您发现此商品已有货，请向我们反馈，以便我们核查评论。</string>
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">若您发现此商品已有货，请向我们反馈，以便我们核查评价。</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
     <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">反馈此商品已有货</string>
 
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">正在检查评价质量</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">正在检查评价质量</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">正在检查评价质量</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">正在检查评价质量</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">这可能需要大约 60 秒。</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">这可能需要大约 60 秒。</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">感谢反馈！</string>
 
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">我们会在 24 小时内提供此商品的评价分析信息，请记得回来查看。</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">无法核查这些评价</string>
+    <string name="review_quality_check_not_analyzable_info_title">无法核查这些评价</string>
 
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">很抱歉，我们无法核查某些类型商品的评价质量，例如礼品卡、流媒体视频、音乐、游戏。</string>
+    <string name="review_quality_check_not_analyzable_info_body">很抱歉，我们无法核查某些类型商品的评价质量，例如礼品卡、流媒体视频、音乐、游戏。</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
-    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">即将提供信息</string>
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">分析信息即将就绪</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">我们会在 24 小时内提供此商品的评价分析信息，请记得回来查看。</string>
     <!-- Title for info card displayed to the user when analysis finished updating. -->
@@ -2336,20 +2356,20 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">好的</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">目前没有可提供的信息</string>
+    <string name="review_quality_check_generic_error_title">目前没有可提供的信息</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">我们正努力解决此问题，请稍后再试。</string>
+    <string name="review_quality_check_generic_error_body">我们正努力解决此问题，请稍后再试。</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">无网络连接</string>
+    <string name="review_quality_check_no_connection_title">无网络连接</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">请检查网络连接，然后尝试重新加载此页面。</string>
+    <string name="review_quality_check_no_connection_body">请检查网络连接，然后尝试重新加载此页面。</string>
 
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">还没有关于这些评价的信息</string>
+    <string name="review_quality_check_no_analysis_title">还没有关于这些评价的信息</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">如需了解对此商品的评价是否可信，请检查评价质量。只需约 60 秒即可得出结果。</string>
+    <string name="review_quality_check_no_analysis_body">如需了解对此商品的评价是否可信，请检查评价质量。只需约 60 秒即可得出结果。</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">检查评价质量</string>
+    <string name="review_quality_check_no_analysis_link">检查评价质量</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">试试我们可信赖的商品评价指南</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2379,11 +2399,11 @@
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">打开核查评价</string>
 
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">测试中</string>
+    <string name="review_quality_check_beta_flag">测试中</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">打开检查评价质量</string>
+    <string name="review_quality_check_open_handle_content_description">打开核查评价</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">关闭检查评价质量</string>
+    <string name="review_quality_check_close_handle_content_description">关闭核查评价</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s 颗星（满分 5 星）</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d40552c6f..daaf4b839 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -329,16 +329,9 @@
     <string name="onboarding_home_enable_notifications_negative_button">現在不要</string>
 
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
-    <!-- Title for set firefox as default browser screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_default_browser_title" moz:RemovedIn="117" tools:ignore="UnusedResources">將 %s 設為主力瀏覽器</string>
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">將 Firefox 設為主力瀏覽器</string>
-    <!-- Description for set firefox as default browser screen.
-        The first parameter is the Firefox brand name.
-        The second parameter is the string with key "juno_onboarding_default_browser_description_link_text". -->
-    <string name="juno_onboarding_default_browser_description" moz:RemovedIn="117" tools:ignore="UnusedResources">%1$s 將人們看得比利潤更重要，並且透過封鎖跨網站追蹤器等機制來捍衛您的隱私。\n\n可到我們的%2$s了解更多資訊。</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox 將人們看得比利潤更重要，並且透過封鎖跨網站追蹤器等機制來捍衛您的隱私。\n\n可到我們的隱私權公告了解更多資訊。</string>
@@ -357,15 +350,9 @@
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">登入</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">現在不要</string>
-    <!-- Title for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_title" moz:RemovedIn="117" tools:ignore="UnusedResources">透過通知，可幫助您使用 %s 做到更多事</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
     <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">透過通知，可幫助您使用 Firefox 做到更多事</string>
-    <!-- Description for enable notification permission screen.
-        The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="juno_onboarding_enable_notifications_description" moz:RemovedIn="117" tools:ignore="UnusedResources">在不同裝置間發送分頁標籤、管理下載項目並獲得能完整發揮 %s 威力的使用秘訣。</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
     <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">在不同裝置間發送分頁標籤、管理下載項目並獲得能完整發揮 Firefox 威力的使用秘訣。</string>
@@ -521,11 +508,15 @@
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">輔助功能</string>
     <!-- Preference to override the Firefox Account server -->
-    <string name="preferences_override_fxa_server">自訂 Firefox 帳號伺服器</string>
+    <string name="preferences_override_fxa_server" moz:RemovedIn="120" tools:ignore="UnusedResources">自訂 Firefox 帳號伺服器</string>
+    <!-- Preference to override the Mozilla account server -->
+    <string name="preferences_override_account_server">自訂 Mozilla 帳號伺服器</string>
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">自訂同步伺服器</string>
     <!-- Toast shown after updating the FxA/Sync server override preferences -->
-    <string name="toast_override_fxa_sync_server_done">已更改 Firefox 帳號 / 同步伺服器設定。將結束應用程式讓變更生效…</string>
+    <string name="toast_override_fxa_sync_server_done" moz:RemovedIn="120" tools:ignore="UnusedResources">已更改 Firefox 帳號 / 同步伺服器設定。將結束應用程式讓變更生效…</string>
+    <!-- Toast shown after updating the Mozilla account/Sync server override preferences -->
+    <string name="toast_override_account_sync_server_done">已更改 Mozilla 帳號 / 同步伺服器設定。將結束應用程式讓變更生效…</string>
     <!-- Preference category for account information -->
     <string name="preferences_category_account">帳號</string>
     <!-- Preference for changing where the toolbar is positioned -->
@@ -541,7 +532,9 @@
     <!-- Preference description for banner about signing in -->
     <string name="preferences_sign_in_description_2">登入後即可同步分頁、書籤、密碼與其他資料。</string>
     <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
-    <string name="preferences_account_default_name">Firefox 帳號</string>
+    <string name="preferences_account_default_name" moz:RemovedIn="120" tools:ignore="UnusedResources">Firefox 帳號</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>
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">重新連線，以恢復同步</string>
     <!-- Preference for language -->
@@ -554,7 +547,7 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">透過 USB 進行遠端除錯</string>
     <!-- Preference title for switch preference to show search engines -->
-    <string name="preferences_show_search_engines">顯示搜尋引擎</string>
+    <string name="preferences_show_search_engines" moz:RemovedIn="120" tools:ignore="UnusedResources">顯示搜尋引擎</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 -->
@@ -574,6 +567,16 @@
 
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">自動完成網址</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">用 App 開啟鏈結</string>
 
@@ -675,9 +678,19 @@
 
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
-    <string name="addon_not_supported_error">不支援的附加元件</string>
+    <string name="addon_not_supported_error" moz:removedIn="120" tools:ignore="UnusedResources">不支援的附加元件</string>
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is already installed -->
-    <string name="addon_already_installed">已經安裝的附加元件</string>
+    <string name="addon_already_installed" moz:removedIn="120" tools:ignore="UnusedResources">已經安裝的附加元件</string>
+
+    <!-- Add-on process crash dialog to user -->
+    <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
+    <string name="addon_process_crash_dialog_title" tools:ignore="UnusedResources">已暫時停用附加元件</string>
+    <!-- The first parameter is the application name. This is a message shown to the user when too many errors have occurred with the addons process and they have been disabled. The user can decide if they would like to continue trying to start add-ons or if they'd rather continue without them. -->
+    <string name="addon_process_crash_dialog_message" tools:ignore="UnusedResources">有一套以上的附加元件停止運作，造成您的系統不穩定。%1$s 嘗試重新啟動這些附加元件卻失敗了。\n\n將不會再於目前的使用階段重新啟動附加元件。\n\n移除或停用造成問題的附加元件，可能可以解決此問題。</string>
+    <!-- This will cause the add-ons to try restarting but the dialog will reappear if it is unsuccessful again -->
+    <string name="addon_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">嘗試重新啟動附加元件</string>
+    <!-- The user will continue with all add-ons disabled -->
+    <string name="addon_process_crash_dialog_disable_addons_button_text" tools:ignore="UnusedResources">繼續使用，但停用附加元件</string>
 
     <!-- Add-on process crash dialog to user -->
     <!-- Title of a dialog shown to the user when enough errors have occurred with addons and they need to be temporarily disabled -->
@@ -692,6 +705,8 @@
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
     <string name="preferences_manage_account">管理帳號</string>
+    <!-- Summary of the preference for managing your account via accounts.firefox.com. -->
+    <string name="preferences_manage_account_summary">更改密碼、管理資料收集或刪除帳號</string>
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">立即同步</string>
     <!-- Preference category for sync -->
@@ -1972,7 +1987,7 @@
     <!-- Content description (not visible, for screen readers etc.): Title for the button to add a search engine in the action bar -->
     <string name="search_engine_add_button_content_description">新增</string>
     <!-- Content description (not visible, for screen readers etc.): Title for the button to save a search engine in the action bar -->
-    <string name="search_engine_add_custom_search_engine_edit_button_content_description">儲存</string>
+    <string name="search_engine_add_custom_search_engine_edit_button_content_description" moz:RemovedIn="120" tools:ignore="UnusedResources">儲存</string>
     <!-- Text for the menu button to edit a search engine -->
     <string name="search_engine_edit">編輯</string>
     <!-- Text for the menu button to delete a search engine -->
@@ -2221,7 +2236,9 @@
 
     <!-- Review quality check feature-->
     <!-- Name for the review quality check feature used as title for the panel. -->
-    <string name="review_quality_check_feature_name">商品評論檢查器</string>
+    <string name="review_quality_check_feature_name" moz:RemovedIn="120" tools:ignore="UnusedResources">商品評論檢查器</string>
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name_2">商品評論檢查器</string>
     <!-- Summary for grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_grade_a_b_description">可靠的評論</string>
     <!-- Summary for grade C for review quality check adjusted grading. -->
@@ -2241,17 +2258,21 @@
     <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
     <string name="review_quality_check_explanation_body_reliability">我們使用來自 %s 的 AI 技術來分析商品評論的可靠程度。此分析僅協助您判斷商品評論品質，而非商品本身的品質。</string>
     <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
-    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[我們會替每筆商品評論標上 A（優良）到 F（不佳）的<b>評分</b>。]]></string>
+    <string name="review_quality_check_info_review_grade_header"><![CDATA[我們會替每筆商品評論標上 A（優良）到 F（不佳）的<b>評分</b>。]]></string>
     <!-- Description explaining grades A and B for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_AB">評論可靠。我們相信此商品的評論內容很可能是來自實際客戶所留下真實而中立的評論。</string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB_2" moz:RemovedIn="120" tools:ignore="UnusedResources">我們認為評論可靠。</string>
     <!-- Description explaining grade C for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_C">我們相信此商品評論混和了可靠與不可靠的評論。</string>
     <!-- Description explaining grades D and F for review quality check adjusted grading. -->
     <string name="review_quality_check_info_grade_info_DF">評論不可靠。我們相信此商品的評論內容很可能是由虛假或偏頗的評論者所留下。</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF_2" moz:RemovedIn="120" tools:ignore="UnusedResources">我們認為評論不可靠。</string>
     <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
     <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[會依照我們認為可靠的評論，重新計算<b>調整後評分</b>。]]></string>
     <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
-    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>重點資訊</b>是根據過去 80 天中，我們相信是可靠的 %s 評論所整理出的資訊。]]></string>
+    <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. -->
@@ -2261,7 +2282,9 @@
     <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
     <string name="review_quality_check_settings_recommended_products">在商品評論檢查器中顯示廣告</string>
     <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
-    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">您會偶而看到相關商品的廣告，所有廣告都必須符合我們的審核評論品質標準。%s</string>
+    <string name="review_quality_check_settings_recommended_products_description" moz:RemovedIn="120" tools:ignore="UnusedResources">您會偶而看到相關商品的廣告，所有廣告都必須符合我們的審核評論品質標準。%s</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description_2" tools:ignore="UnusedResources">您會偶爾看到相關產品的廣告。我們只會為評論可靠的產品進行宣傳。 %s</string>
     <!-- Clickable text that links to review quality check recommended products support article. -->
     <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">了解更多</string>
     <!-- Text for turning sidebar off button from review quality check settings section. -->
@@ -2281,29 +2304,31 @@
     <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
     <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">立刻檢查</string>
     <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_title" tools:ignore="UnusedResources">還沒有足夠的評論數</string>
+    <string name="review_quality_check_no_reviews_warning_title">還沒有足夠的評論數</string>
     <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
-    <string name="review_quality_check_no_reviews_warning_body" tools:ignore="UnusedResources">當此商品有足夠的評論後，即可檢查其評論品質。</string>
+    <string name="review_quality_check_no_reviews_warning_body">當此商品有足夠的評論後，即可檢查其評論品質。</string>
     <!-- Title for warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">商品已下架</string>
     <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
     <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">若您發現此產品又上架了，請回報給我們，我們將盡快檢查評論內容。</string>
     <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
-    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">回報此商品已重新上架</string>
+    <string name="review_quality_check_product_availability_warning_action" moz:RemovedIn="120" tools:ignore="UnusedResources">回報此商品已重新上架</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action_2" tools:ignore="UnusedResources">回報產品已有庫存</string>
     <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
-    <string name="review_quality_check_reanalysis_in_progress_warning_title" tools:ignore="UnusedResources">正在檢查評論品質</string>
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">正在檢查評論品質</string>
     <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_title" tools:ignore="UnusedResources">正在檢查評論品質</string>
+    <string name="review_quality_check_analysis_in_progress_warning_title">正在檢查評論品質</string>
     <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
-    <string name="review_quality_check_analysis_in_progress_warning_body" tools:ignore="UnusedResources">可能需要 60 秒左右的時間。</string>
+    <string name="review_quality_check_analysis_in_progress_warning_body">可能需要 60 秒左右的時間。</string>
     <!-- Title for info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">感謝您回報！</string>
     <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
     <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">我們將在 24 小時內提供更新過的評論分析資訊，請稍候再回來。</string>
     <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_title" tools:ignore="UnusedResources">我們無法檢查這些評論</string>
+    <string name="review_quality_check_not_analyzable_info_title">我們無法檢查這些評論</string>
     <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
-    <string name="review_quality_check_not_analyzable_info_body" tools:ignore="UnusedResources">很可惜，我們無法確認某些類型產品（例如：儲值卡、影音串流服務、遊戲）的評論品質。</string>
+    <string name="review_quality_check_not_analyzable_info_body">很可惜，我們無法確認某些類型產品（例如：儲值卡、影音串流服務、遊戲）的評論品質。</string>
     <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
     <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">即將提供資訊</string>
     <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
@@ -2313,19 +2338,19 @@
     <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
     <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">知道了！</string>
     <!-- Title for error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_title" tools:ignore="UnusedResources">目前沒有可用資訊</string>
+    <string name="review_quality_check_generic_error_title">目前沒有可用資訊</string>
     <!-- Text for body of error card displayed to the user when an error occurred. -->
-    <string name="review_quality_check_generic_error_body" tools:ignore="UnusedResources">我們正在努力解決此問題，請稍後再回來。</string>
+    <string name="review_quality_check_generic_error_body">我們正在努力解決此問題，請稍後再回來。</string>
     <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_title" tools:ignore="UnusedResources">沒有網路連線</string>
+    <string name="review_quality_check_no_connection_title">沒有網路連線</string>
     <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
-    <string name="review_quality_check_no_connection_body" tools:ignore="UnusedResources">請檢查您的網路連線是否正常，然後嘗試重新載入頁面。</string>
+    <string name="review_quality_check_no_connection_body">請檢查您的網路連線是否正常，然後嘗試重新載入頁面。</string>
     <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_title" tools:ignore="UnusedResources">還沒有這些評論的相關資訊</string>
+    <string name="review_quality_check_no_analysis_title">還沒有這些評論的相關資訊</string>
     <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
-    <string name="review_quality_check_no_analysis_body" tools:ignore="UnusedResources">可檢查商品評論的品質來了解此商品的評論是否可靠，只需約 60 秒即可完成。</string>
+    <string name="review_quality_check_no_analysis_body">可檢查商品評論的品質來了解此商品的評論是否可靠，只需約 60 秒即可完成。</string>
     <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
-    <string name="review_quality_check_no_analysis_link" tools:ignore="UnusedResources">檢查評論品質</string>
+    <string name="review_quality_check_no_analysis_link">檢查評論品質</string>
     <!-- Headline for review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_title">試用我們可信任的商品評論</string>
     <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
@@ -2335,13 +2360,13 @@
     <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
     <string name="review_quality_check_contextual_onboarding_learn_more_link">了解更多</string>
     <!-- Caption text to be displayed in review quality check contextual onboarding card above the opt-in button. First parameter is the Fakespot product name. Following parameters are for clickable texts defined in review_quality_check_contextual_onboarding_privacy_policy and review_quality_check_contextual_onboarding_terms_use. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
-    <string name="review_quality_check_contextual_onboarding_caption">選擇「好，使用看看」，代表您同意 %1$s by Mozilla 的 %2$s 與 %3$s 。</string>
+    <string name="review_quality_check_contextual_onboarding_caption">選擇「好，試用看看」，代表您同意 %1$s by Mozilla 的 %2$s 與 %3$s 。</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot privacy policy. -->
     <string name="review_quality_check_contextual_onboarding_privacy_policy">隱私權保護政策</string>
     <!-- Clickable text from the review quality check contextual onboarding card that links to Fakespot terms of use. -->
     <string name="review_quality_check_contextual_onboarding_terms_use">使用條款</string>
     <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
-    <string name="review_quality_check_contextual_onboarding_primary_button_text">好，使用看看</string>
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">好，試用看看</string>
     <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
     <string name="review_quality_check_contextual_onboarding_secondary_button_text">現在不要</string>
     <!-- Text for the first CFR presenting the review quality check feature. -->
@@ -2353,11 +2378,11 @@
     <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
     <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">開啟商品評論檢查器</string>
     <!-- Flag showing that the review quality check feature is work in progress. -->
-    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta 測試版</string>
+    <string name="review_quality_check_beta_flag">Beta 測試版</string>
     <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check">開啟商品評論檢查</string>
+    <string name="review_quality_check_open_handle_content_description">開啟商品評論檢查器</string>
     <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
-    <string name="browser_menu_review_quality_check_close">關閉商品評論檢查</string>
+    <string name="review_quality_check_close_handle_content_description">關閉商品評論檢查器</string>
     <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
     <string name="review_quality_check_star_rating_content_description">%1$s 顆星，滿分 5 顆星</string>
     <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 36c89975d..7ec727cd8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,6 +23,14 @@
     <color name="fx_mobile_layer_color_gradient_start">@color/photonViolet70</color>
     <!-- Tooltip -->
     <color name="fx_mobile_layer_color_gradient_end">@color/photonViolet40</color>
+    <!-- Warning background -->
+    <color name="fx_mobile_layer_color_warning" tools:ignore="UnusedResources">@color/photonYellow20</color>
+    <!-- Confirmation background -->
+    <color name="fx_mobile_layer_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen20</color>
+    <!-- Error background -->
+    <color name="fx_mobile_layer_color_error" tools:ignore="UnusedResources">@color/photonRed10</color>
+    <!-- Info background -->
+    <color name="fx_mobile_layer_color_info" tools:ignore="UnusedResources">@color/photonBlue50A44</color>
 
     <!-- Action -->
     <!-- Primary button, Snackbar, Floating action button, Chip selected -->
@@ -32,7 +40,15 @@
     <!-- Filter -->
     <color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
     <!-- Chip -->
-    <color name="fx_mobile_action_quarternary" tools:ignore="UnusedResources">@color/photonLightGrey10</color>
+    <color name="fx_mobile_action_color_quarternary" tools:ignore="UnusedResources">@color/photonLightGrey10</color>
+    <!-- Warning button -->
+    <color name="fx_mobile_action_color_warning" tools:ignore="UnusedResources">@color/photonYellow60A40</color>
+    <!-- Confirmation button -->
+    <color name="fx_mobile_action_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen60</color>
+    <!-- Error button -->
+    <color name="fx_mobile_action_color_error" tools:ignore="UnusedResources">@color/photonRed30</color>
+    <!-- Info button -->
+    <color name="fx_mobile_action_color_info" tools:ignore="UnusedResources">@color/photonBlue50</color>
     <!-- Checkbox default, Radio button default -->
     <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Checkbox selected, Radio button selected -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4347f6bb5..c4f764c9c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,6 +11,10 @@
     <dimen name="mozac_browser_menu_width_max" tools:ignore="UnusedResources">314dp</dimen>
     <dimen name="mozac_browser_menu_corner_radius">8dp</dimen>
     <dimen name="mozac_browser_menu2_corner_radius">8dp</dimen>
+    <dimen name="mozac_browser_menu_item_checkbox_container_padding_end" tools:ignore="UnusedResources">0dp</dimen>
+    <dimen name="mozac_browser_menu_item_checkbox_text_label_padding_end" tools:ignore="UnusedResources">8dp</dimen>
+    <dimen name="mozac_browser_menu_item_image_checkbox_padding_start" tools:ignore="UnusedResources">8dp</dimen>
+    <dimen name="mozac_browser_menu_item_image_checkbox_padding_end" tools:ignore="UnusedResources">16dp</dimen>
     <dimen name="library_item_height">56dp</dimen>
     <dimen name="library_item_icon_margin_horizontal">16dp</dimen>
     <dimen name="history_favicon_width_height">48dp</dimen>
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 77f9abb33..ca77bec25 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -76,6 +76,7 @@
     <string name="pref_key_nimbus_last_fetch" translatable="false">pref_key_nimbus_last_fetch</string>
     <string name="pref_key_home_blocklist">pref_key_home_blocklist</string>
     <string name="pref_key_hidden_engines_restored" translatable="false">pref_key_hidden_engines_restored</string>
+    <string name="pref_key_enable_fxsuggest" translatable="false">pref_key_fxsuggest_enabled</string>
 
     <!-- Data Choices -->
     <string name="pref_key_telemetry" translatable="false">pref_key_telemetry</string>
@@ -94,7 +95,7 @@
     <string name="pref_key_sign_out" translatable="false">pref_key_sign_out</string>
     <string name="pref_key_sync_sign_in" translatable="false">pref_key_sync_sign_in</string>
     <string name="pref_key_push_project_id" translatable="false">project_id</string>
-    <string name="pref_key_search_widget_installed" translatable="false">pref_key_search_widget_installed</string>
+    <string name="pref_key_search_widget_installed_2" translatable="false">pref_key_search_widget_installed_2</string>
     <string name="pref_key_saved_logins_sorting_strategy" translatable="false">pref_key_saved_logins_sorting_strategy</string>
     <!-- Key for credit cards sync preference in the account settings fragment -->
     <string name="pref_key_sync_credit_cards" translatable="false">pref_key_sync_credit_cards</string>
@@ -113,6 +114,8 @@
     <string name="pref_key_show_search_suggestions_in_private_onboarding" translatable="false">pref_key_show_search_suggestions_in_privateonboarding</string>
     <string name="pref_key_show_voice_search" translatable="false">pref_key_show_voice_search</string>
     <string name="pref_key_enable_autocomplete_urls" translatable="false">pref_key_enable_domain_autocomplete</string>
+    <string name="pref_key_show_sponsored_suggestions" translatable="false">pref_key_show_sponsored_suggestions</string>
+    <string name="pref_key_show_nonsponsored_suggestions" translatable="false">pref_key_show_nonsponsored_suggestions</string>
 
     <!-- Site Permissions Settings -->
     <string name="pref_key_site_permissions_description" translatable="false">pref_key_site_permissions_description</string>
@@ -250,8 +253,6 @@
     <string name="pref_key_show_top_sites" translatable="false">pref_key_show_top_sites</string>
     <!-- Whether or not the sponsored shortcuts are shown along with the top recent sites shortcuts -->
     <string name="pref_key_enable_contile" translatable="false">pref_key_enable_contile</string>
-    <!-- Whether or not the Task Continuity enhancements are shown -->
-    <string name="pref_key_enable_task_continuity" translatable="false">pref_key_enable_task_continuity</string>
     <!-- Query containing the search parameters to be hidden from the top frecent sites  -->
     <string name="pref_key_frecency_filter_query" translatable="false">pref_key_frecency_filter_query</string>
 
@@ -276,6 +277,8 @@
     <string name="pref_key_should_show_home_onboarding_dialog" translatable="false">pref_key_should_show_home_onboarding_dialog</string>
     <!-- A value  of `true` means the total cookie protection popup has not been shown yet -->
     <string name="pref_key_should_show_total_cookie_protection_popup" translatable="false">pref_key_should_show_total_cookie_protection_popup</string>
+    <!-- A value  of `true` means the erase action popup has not been shown yet -->
+    <string name="pref_key_should_show_erase_action_popup" translatable="false">pref_key_should_show_erase_action_popup</string>
 
     <string name="pref_key_debug_settings" translatable="false">pref_key_debug_settings</string>
 
@@ -352,6 +355,7 @@
     <string name="pref_key_custom_sponsored_stories_city" translatable="false">pref_key_custom_sponsored_stories_city</string>
     <string name="pref_key_enable_compose_top_sites" translatable="false">pref_key_enable_compose_top_sites</string>
     <string name="pref_key_enable_shopping_experience" translatable="false">pref_key_enable_shopping_experience</string>
+    <string name="pref_key_enable_translations" translatable="false">pref_key_enable_translations</string>
 
     <!-- Growth Data -->
     <string name="pref_key_growth_set_as_default" translatable="false">pref_key_growth_set_as_default</string>
@@ -379,4 +383,6 @@
     <!--Shopping -->
     <string name="pref_key_is_review_quality_check_enabled">pref_key_is_review_quality_check_enabled</string>
     <string name="pref_key_is_review_quality_check_product_recommendations_enabled">pref_key_is_review_quality_check_product_recommendations_enabled</string>
+    <string name="pref_key_should_show_review_quality_cfr">pref_key_should_show_review_quality_cfr</string>
+    <string name="pref_key_should_show_review_quality_opt_in_time">pref_key_should_show_review_quality_opt_in_time</string>
 </resources>
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index 09cd072b7..7bde263cb 100644
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -26,6 +26,8 @@
     <string name="app_services_abbreviation" translatable="false">AS</string>
     <!-- Name for the Pocket product -->
     <string name="pocket_product_name" translatable="false">Pocket</string>
+    <!-- Name for the Fakespot product -->
+    <string name="shopping_product_name" translatable="false">Fakespot</string>
 
     <!-- Secret Settings Strings -->
     <!-- Label for the secret settings preference -->
@@ -40,8 +42,6 @@
     <string name="preferences_nimbus_experiments">Nimbus Experiments</string>
     <!-- Label for using the nimbus collections preview -->
     <string name="preferences_nimbus_use_preview_collection">Use Nimbus Preview Collection (requires restart)</string>
-    <!-- Label for enabling the Task Continuity feature -->
-    <string name="preferences_debug_settings_task_continuity" translatable="false">Enable Task Continuity</string>
     <!-- Label for custom Glean server URL -->
     <string name="preferences_debug_settings_custom_glean_server_url" translatable="false">Custom Glean server URL (requires restart)</string>
     <!-- Label for custom Pocket sponsored stories settings -->
@@ -68,6 +68,10 @@
     <string name="preferences_debug_settings_compose_top_sites" translatable="false">Enable Compose Top Sites</string>
     <!-- Label for enabling the shopping experience -->
     <string name="preferences_debug_settings_shopping_experience" translatable="false">Enable Shopping Experience</string>
+    <!-- Label for enabling translations -->
+    <string name="preferences_debug_settings_translations" translatable="false">Enable Firefox Translations</string>
+    <!-- Label for enabling Firefox Suggest -->
+    <string name="preferences_debug_settings_fxsuggest" translatable="false">Enable Firefox Suggest</string>
 
     <!-- A secret menu option in the tabs tray for making a tab inactive for testing. -->
     <string name="inactive_tabs_menu_item">Make inactive</string>
@@ -111,50 +115,7 @@
 
     <string name="profiler_uploaded_url_to_clipboard">URL copied to clipboard successfully</string>
 
-    <!-- These strings are placeholders till they are finalised for review quality check -->
-    <!-- Browser menu button to open review quality check -->
-    <string name="browser_menu_review_quality_check" translatable="false">Review quality check</string>
-    <!-- Browser menu button content description to close review quality check-->
-    <string name="browser_menu_review_quality_check_close" translatable="false">Close review quality check</string>
-    <string name="review_quality_check" translatable="false">Review quality check</string>
-    <string name="review_quality_check_grade_a_b_description" translatable="false">Reliable reviews</string>
-    <string name="review_quality_check_grade_c_description" translatable="false">Only some reliable reviews</string>
-    <string name="review_quality_check_grade_d_f_description" translatable="false">Unreliable reviews</string>
-    <string name="review_quality_check_star_rating_content_description" translatable="false">%1$s out of 5 stars</string>
-    <string name="review_quality_check_grade_title" translatable="false">How reliable are the reviews?</string>
-    <string name="review_quality_check_contextual_onboarding_title" translatable="false">Shop based on real reviews</string>
-    <string name="review_quality_check_contextual_onboarding_description" translatable="false">Review quality check is a new feature from Firefox. It helps you understand how reliable the reviews are for a product, when you shop on Amazon, Best Buy, and Walmart. \n\nAnd, it’s all powered by AI technology from Fakespot, a popular browser extension that’s now built in.</string>
-    <string name="review_quality_check_contextual_onboarding_primary_button_text" translatable="false">Yes, check review quality</string>
-    <string name="review_quality_check_contextual_onboarding_secondary_button_text" translatable="false">Not now</string>
-    <string name="review_quality_check_contextual_onboarding_caption" translatable="false">Analysis powered by Fakespot.com. Learn more.</string>
-    <string name="review_quality_check_settings_title" translatable="false">Settings</string>
-    <string name="review_quality_check_settings_recommended_products" translatable="false">Show products recommended by Firefox</string>
-    <string name="review_quality_check_settings_turn_off" translatable="false">Turn off review quality check</string>
-    <string name="review_quality_check_adjusted_rating_title" translatable="false">Adjusted rating</string>
-    <string name="review_quality_check_adjusted_rating_description" translatable="false">Unreliable reviews removed</string>
-    <string name="review_quality_check_highlights_caption" translatable="false">Summarized using information provided by Fakespot.com. View full analysis</string>
-    <string name="review_quality_check_highlights_title" translatable="false">Highlights from recent reviews</string>
-    <string name="review_quality_check_highlights_show_less" translatable="false">Show less</string>
-    <string name="review_quality_check_highlights_show_more" translatable="false">Show more</string>
-    <string name="review_quality_check_highlights_type_quality" translatable="false">Quality</string>
-    <string name="review_quality_check_highlights_type_price" translatable="false">Price</string>
-    <string name="review_quality_check_highlights_type_shipping" translatable="false">Shipping</string>
-    <string name="review_quality_check_highlights_type_packaging_appearance" translatable="false">Packaging and appearance</string>
-    <string name="review_quality_check_highlights_type_competitiveness" translatable="false">Competitiveness</string>
-    <string name="review_quality_check_info_title" translatable="false">How reliable are the reviews?</string>
-    <string name="review_quality_check_info_overview" translatable="false">Firefox uses AI technology from Fakespot to analyze the quality and reliability of product reviews. This is only provided to help you assess review quality, not product quality.\n
-                        \n
-                        We assign each product’s reviews a letter grade from A to F.\n
-                        \n
-                        A higher grade means we believe the reviews are likely from real customers who left honest, unbiased reviews. \n
-                        A lower grade means we believe the reviews are likely from paid or biased reviewers.
-                        \n\nThe adjusted rating is based on review quality, with unreliable reviews removed.
-                        \n\nHelpful snippets are pulled from recent Amazon reviews (from the last 80 days), that we believe to be reliable.</string>
-    <string name="review_quality_check_info_learn_more" translatable="false">Learn more about %s</string>
-    <string name="review_quality_check_info_learn_more_link" translatable="false">how Fakespot determines review quality.</string>
-    <string name="review_quality_check_info_review_grade_header" translatable="false">Review grading scale:</string>
-    <string name="review_quality_check_info_grade_info_AB" translatable="false">We believe the reviews to be reliable</string>
-    <string name="review_quality_check_info_grade_info_C" translatable="false">We believe there’s a mix of reliable and unreliable reviews</string>
-    <string name="review_quality_check_info_grade_info_DF" translatable="false">We believe the reviews are unreliable</string>
-
+    <string name="review_quality_check_retailer_name_amazon">Amazon</string>
+    <string name="review_quality_check_retailer_name_bestbuy">Best Buy</string>
+    <string name="review_quality_check_retailer_name_walmart">Walmart</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a58ea72d..568a5681a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,6 +65,19 @@
        Common myths about private browsing
     </string>
 
+    <!-- True Private Browsing Mode -->
+    <!-- Title for info card on private homescreen in True Private Browsing Mode. -->
+    <string name="felt_privacy_desc_card_title">Leave no traces on this device</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">%1$s deletes your cookies, history, and site data when you close all your private windows. %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">Who might be able to see my activity?</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">Launch your next private tab in one tap.</string>
@@ -87,6 +100,11 @@
     <!-- Text displayed that links to website containing documentation about the "Total cookie protection" feature. -->
     <string name="tcp_cfr_learn_more">Learn about Total Cookie Protection</string>
 
+    <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
+    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the erase private browsing feature. -->
+    <string name="erase_action_cfr_message">Tap here to start a fresh private session. Delete your history, cookies — everything.</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">Camera access needed. Go to Android settings, tap permissions, and tap allow.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -214,7 +232,9 @@
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Home screen</string>
-
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Erase browsing history</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selected language</string>
@@ -522,6 +542,16 @@
     <string name="preferences_account_settings">Account settings</string>
     <!-- Preference for enabling url autocomplete-->
     <string name="preferences_enable_autocomplete_urls">Autocomplete URLs</string>
+    <!-- Preference title for switch preference to show sponsored Firefox Suggest search suggestions -->
+    <string name="preferences_show_sponsored_suggestions">Suggestions from sponsors</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">Support %1$s with occasional sponsored suggestions</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">Suggestions from %1$s</string>
+    <!-- Summary for preference to show Firefox Suggest search suggestions for web content -->
+    <string name="preferences_show_nonsponsored_suggestions_summary">Get suggestions from the web related to your search</string>
     <!-- Preference for open links in third party apps -->
     <string name="preferences_open_links_in_apps">Open links in apps</string>
     <!-- Preference for open links in third party apps always open in apps option -->
@@ -1284,6 +1314,8 @@
     <string name="snackbar_private_tab_closed">Private tab closed</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Private tabs closed</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Private browsing data deleted</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">UNDO</string>
     <!-- Text shown in snackbar when user removes a top site -->
@@ -2079,6 +2111,162 @@
     <!-- Snackbar button text to navigate to telemetry settings.-->
     <string name="experiments_snackbar_button">Go to settings</string>
 
+    <!-- Review quality check feature-->
+    <!-- Name for the review quality check feature used as title for the panel. -->
+    <string name="review_quality_check_feature_name">Review checker</string>
+    <!-- Summary for grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_a_b_description">Reliable reviews</string>
+    <!-- Summary for grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_c_description">Mix of reliable and unreliable reviews</string>
+    <!-- Summary for grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_grade_d_f_description">Unreliable reviews</string>
+    <!-- Text for title presenting the reliability of a product's reviews. -->
+    <string name="review_quality_check_grade_title">How reliable are these reviews?</string>
+    <!-- Title for when the rating has been updated by the review checker -->
+    <string name="review_quality_check_adjusted_rating_title">Adjusted rating</string>
+    <!-- Description for a product's adjusted star rating. The text presents that the product's reviews which were evaluated as unreliable were removed from the adjusted rating. -->
+    <string name="review_quality_check_adjusted_rating_description">Unreliable reviews removed</string>
+    <!-- Title for list of highlights from a product's review emphasizing a product's important traits. -->
+    <string name="review_quality_check_highlights_title">Highlights from recent reviews</string>
+    <!-- Title for section explaining how we analyze the reliability of a product's reviews. -->
+    <string name="review_quality_check_explanation_title">How we determine review quality</string>
+    <!-- Paragraph explaining how we analyze the reliability of a product's reviews. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_explanation_body_reliability">We use AI technology from %s by Mozilla to check the reliability of product reviews. This will only help you assess review quality, not product quality. </string>
+    <!-- Paragraph explaining the grading system we use to classify the reliability of a product's reviews. -->
+    <string name="review_quality_check_info_review_grade_header" tools:ignore="UnusedResources"><![CDATA[We assign each product’s reviews a <b>letter grade</b> from A to F.]]></string>
+    <!-- Description explaining grades A and B for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_AB">Reliable reviews. We believe the reviews are likely from real customers who left honest, unbiased reviews.</string>
+    <!-- Description explaining grade C for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_C">We believe there’s a mix of reliable and unreliable reviews.</string>
+    <!-- Description explaining grades D and F for review quality check adjusted grading. -->
+    <string name="review_quality_check_info_grade_info_DF">Unreliable reviews. We believe the reviews are likely fake or from biased reviewers.</string>
+    <!-- Paragraph explaining how a product's adjusted grading is calculated. -->
+    <string name="review_quality_check_explanation_body_adjusted_grading"><![CDATA[The <b>adjusted rating</b> is based only on reviews we believe to be reliable.]]></string>
+    <!-- Paragraph explaining product review highlights. First parameter is the name of the retailer (e.g. Amazon). -->
+    <string name="review_quality_check_explanation_body_highlights" tools:ignore="UnusedResources"><![CDATA[<b>Highlights</b> are from %s reviews within the last 80 days that we believe to be reliable.]]></string>
+    <!-- Text for learn more caption presenting a link with information about review quality. First parameter is for clickable text defined in review_quality_check_info_learn_more_link. -->
+    <string name="review_quality_check_info_learn_more">Learn more about %s.</string>
+    <!-- Clickable text that links to review quality check SuMo page. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_info_learn_more_link">how %s by Mozilla determines review quality</string>
+    <!-- Text for title of settings section. -->
+    <string name="review_quality_check_settings_title">Settings</string>
+    <!-- Text for label for switch preference to show recommended products from review quality check settings section. -->
+    <string name="review_quality_check_settings_recommended_products">Show ads in review checker</string>
+    <!-- Description for switch preference to show recommended products from review quality check settings section. First parameter is for clickable text defined in review_quality_check_settings_recommended_products_learn_more.-->
+    <string name="review_quality_check_settings_recommended_products_description" tools:ignore="UnusedResources">You’ll see occasional ads for relevant products. All ads must meet our review quality standards. %s</string>
+    <!-- Clickable text that links to review quality check recommended products support article. -->
+    <string name="review_quality_check_settings_recommended_products_learn_more" tools:ignore="UnusedResources">Learn more</string>
+    <!-- Text for turning sidebar off button from review quality check settings section. -->
+    <string name="review_quality_check_settings_turn_off">Turn off review checker</string>
+    <!-- Text for title of recommended product section. This is displayed above a product image, suggested as an alternative to the product reviewed. -->
+    <string name="review_quality_check_ad_title" tools:ignore="UnusedResources">More to consider</string>
+    <!-- Caption for recommended product section indicating this is an ad by Fakespot. First parameter is the Fakespot product name. -->
+    <string name="review_quality_check_ad_caption" tools:ignore="UnusedResources">Ad by %s</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by" tools:ignore="UnusedResources" moz:RemovedIn="119">Review checker is powered by %s.</string>
+    <!-- Caption for review quality check panel. First parameter is for clickable text defined in review_quality_check_powered_by_link. -->
+    <string name="review_quality_check_powered_by_2">Review checker is powered by %s</string>
+    <!-- Clickable text that links to Fakespot.com. First parameter is the Fakespot product name. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_powered_by_link" tools:ignore="UnusedResources">%s by Mozilla</string>
+    <!-- Text for title of warning card informing the user that the current analysis is outdated. -->
+    <string name="review_quality_check_outdated_analysis_warning_title" tools:ignore="UnusedResources">New info to check</string>
+    <!-- Text for button from warning card informing the user that the current analysis is outdated. Clicking this should trigger the product's re-analysis. -->
+    <string name="review_quality_check_outdated_analysis_warning_action" tools:ignore="UnusedResources">Check now</string>
+    <!-- Title for warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_title">Not enough reviews yet</string>
+    <!-- Text for body of warning card informing the user that the current product does not have enough reviews for a review analysis. -->
+    <string name="review_quality_check_no_reviews_warning_body">When this product has more reviews, we’ll be able to check their quality.</string>
+    <!-- Title for warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_title" tools:ignore="UnusedResources">Product is not available</string>
+    <!-- Text for the body of warning card informing the user that the current product is currently not available. -->
+    <string name="review_quality_check_product_availability_warning_body" tools:ignore="UnusedResources">If you see this product is back in stock, report it and we’ll work on checking the reviews.</string>
+    <!-- Clickable text for warning card informing the user that the current product is currently not available. Clicking this should inform the server that the product is available. -->
+    <string name="review_quality_check_product_availability_warning_action" tools:ignore="UnusedResources">Report this product is back in stock</string>
+    <!-- Title for warning card informing the user that the current product's re-analysis is still processing. -->
+    <string name="review_quality_check_reanalysis_in_progress_warning_title">Checking review quality</string>
+    <!-- Title for warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_title">Checking review quality</string>
+    <!-- Text for body of warning card informing the user that the current product's analysis is still processing. -->
+    <string name="review_quality_check_analysis_in_progress_warning_body">This could take about 60 seconds.</string>
+    <!-- Title for info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_title" tools:ignore="UnusedResources">Thanks for reporting!</string>
+    <!-- Text for body of info card displayed after the user reports a product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_info_body" tools:ignore="UnusedResources">We should have info about this product’s reviews within 24 hours. Please check back.</string>
+    <!-- Title for info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_title">We can’t check these reviews</string>
+    <!-- Text for body of info card displayed when the user review checker while on a product that Fakespot does not analyze (e.g. gift cards, music). -->
+    <string name="review_quality_check_not_analyzable_info_body">Unfortunately, we can’t check the review quality for certain types of products. For example, gift cards and streaming video, music, and games.</string>
+    <!-- Title for info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_title" tools:ignore="UnusedResources">Info coming soon</string>
+    <!-- Text for body of info card displayed when another user reported the displayed product is back in stock. -->
+    <string name="review_quality_check_analysis_requested_other_user_info_body" tools:ignore="UnusedResources">We should have info about this product’s reviews within 24 hours. Please check back.</string>
+    <!-- Title for info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_title" tools:ignore="UnusedResources">Analysis is up to date</string>
+    <!-- Text for the action button from info card displayed to the user when analysis finished updating. -->
+    <string name="review_quality_check_analysis_updated_confirmation_action" tools:ignore="UnusedResources">Got it</string>
+    <!-- Title for error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_title">No info available right now</string>
+    <!-- Text for body of error card displayed to the user when an error occurred. -->
+    <string name="review_quality_check_generic_error_body">We’re working to resolve the issue. Please check back soon.</string>
+    <!-- Title for error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_title">No network connection</string>
+    <!-- Text for body of error card displayed to the user when the device is disconnected from the network. -->
+    <string name="review_quality_check_no_connection_body">Check your network connection and then try reloading the page.</string>
+    <!-- Title for card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_title">No info about these reviews yet</string>
+    <!-- Text for the body of card displayed to the user for products whose reviews were not analyzed yet. -->
+    <string name="review_quality_check_no_analysis_body">To know whether this product’s reviews are reliable, check the review quality. It only takes about 60 seconds.</string>
+    <!-- Text for button from body of card displayed to the user for products whose reviews were not analyzed yet. Clicking this should trigger a product analysis. -->
+    <string name="review_quality_check_no_analysis_link">Check review quality</string>
+    <!-- Headline for review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_title">Try our trusted guide to product reviews</string>
+    <!-- Description for review quality check contextual onboarding card. The first and last two parameters are for retailer names (e.g. Amazon, Walmart). The second parameter is for the name of the application (e.g. Firefox). -->
+    <string name="review_quality_check_contextual_onboarding_description">See how reliable product reviews are on %1$s before you buy. Review checker, an experimental feature from %2$s, is built right into the browser. It works on %3$s and %4$s, too.</string>
+    <!-- Paragraph presenting review quality check feature. First parameter is the Fakespot product name. Second parameter is for clickable text defined in review_quality_check_contextual_onboarding_learn_more_link. In the phrase "Fakespot by Mozilla", "by" can be localized. Does not need to stay by. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more">Using the power of %1$s by Mozilla, we help you avoid biased and inauthentic reviews. Our AI model is always improving to protect you as you shop. %2$s</string>
+    <!-- Clickable text from the contextual onboarding card that links to review quality check support article. -->
+    <string name="review_quality_check_contextual_onboarding_learn_more_link">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>
+    <!-- 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>
+    <!-- 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>
+    <!-- Text for opt-in button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_primary_button_text">Yes, try it</string>
+    <!-- Text for opt-out button from the review quality check contextual onboarding card. -->
+    <string name="review_quality_check_contextual_onboarding_secondary_button_text">Not now</string>
+    <!-- Text for the first CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_first_cfr_message">Find out if you can trust this product’s reviews — before you buy.</string>
+    <!-- Text displayed in the first CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_first_cfr_action" tools:ignore="UnusedResources">Try review checker</string>
+    <!-- Text for the second CFR presenting the review quality check feature. -->
+    <string name="review_quality_check_second_cfr_message">Are these reviews reliable? Check now to see an adjusted rating.</string>
+    <!-- Text displayed in the second CFR presenting the review quality check feature that opens the review checker when clicked. -->
+    <string name="review_quality_check_second_cfr_action" tools:ignore="UnusedResources">Open review checker</string>
+    <!-- Flag showing that the review quality check feature is work in progress. -->
+    <string name="review_quality_check_beta_flag" tools:ignore="UnusedResources">Beta</string>
+    <!-- Content description (not visible, for screen readers etc.) for opening browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_open_handle_content_description">Open review checker</string>
+    <!-- Content description (not visible, for screen readers etc.) for closing browser menu button to open review quality check bottom sheet. -->
+    <string name="review_quality_check_close_handle_content_description">Close review checker</string>
+    <!-- Content description (not visible, for screen readers etc.) for review quality check star rating. First parameter is the number of stars (1-5) representing the rating. -->
+    <string name="review_quality_check_star_rating_content_description">%1$s out of 5 stars</string>
+    <!-- Text for minimize button from highlights card. When clicked the highlights card should reduce its size. -->
+    <string name="review_quality_check_highlights_show_less">Show less</string>
+    <!-- Text for maximize button from highlights card. When clicked the highlights card should expand to its full size. -->
+    <string name="review_quality_check_highlights_show_more">Show more</string>
+    <!-- Text for highlights card quality category header. Reviews shown under this header should refer the product's quality. -->
+    <string name="review_quality_check_highlights_type_quality">Quality</string>
+    <!-- Text for highlights card price category header. Reviews shown under this header should refer the product's price. -->
+    <string name="review_quality_check_highlights_type_price">Price</string>
+    <!-- Text for highlights card shipping category header. Reviews shown under this header should refer the product's shipping. -->
+    <string name="review_quality_check_highlights_type_shipping">Shipping</string>
+    <!-- Text for highlights card packaging and appearance category header. Reviews shown under this header should refer the product's packaging and appearance. -->
+    <string name="review_quality_check_highlights_type_packaging_appearance">Packaging and appearance</string>
+    <!-- Text for highlights card competitiveness category header. Reviews shown under this header should refer the product's competitiveness. -->
+    <string name="review_quality_check_highlights_type_competitiveness">Competitiveness</string>
+
     <!-- Accessibility services actions labels. These will be appended to accessibility actions like "Double tap to.." but not by or applications but by services like Talkback. -->
     <!-- Action label for elements that can be collapsed if interacting with them. Talkback will append this to say "Double tap to collapse". -->
     <string name="a11y_action_label_collapse">collapse</string>
diff --git a/app/src/main/res/xml/search_settings_preferences.xml b/app/src/main/res/xml/search_settings_preferences.xml
index c6cb90fb1..0ecf24204 100644
--- a/app/src/main/res/xml/search_settings_preferences.xml
+++ b/app/src/main/res/xml/search_settings_preferences.xml
@@ -72,5 +72,15 @@
             android:layout="@layout/checkbox_left_preference"
             android:title="@string/preferences_show_search_suggestions_in_private"
             app:iconSpaceReserved="false" />
+        <SwitchPreference
+            app:iconSpaceReserved="false"
+            android:key="@string/pref_key_show_nonsponsored_suggestions"
+            android:title="@string/preferences_show_nonsponsored_suggestions"
+            android:summary="@string/preferences_show_nonsponsored_suggestions_summary" />
+        <SwitchPreference
+            app:iconSpaceReserved="false"
+            android:key="@string/pref_key_show_sponsored_suggestions"
+            android:title="@string/preferences_show_sponsored_suggestions"
+            android:summary="@string/preferences_show_sponsored_suggestions_summary" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/secret_settings_preferences.xml b/app/src/main/res/xml/secret_settings_preferences.xml
index 3360c80db..f2eb8c195 100644
--- a/app/src/main/res/xml/secret_settings_preferences.xml
+++ b/app/src/main/res/xml/secret_settings_preferences.xml
@@ -15,11 +15,6 @@
         android:key="@string/pref_key_nimbus_use_preview"
         android:title="@string/preferences_nimbus_use_preview_collection"
         app:iconSpaceReserved="false" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key_enable_task_continuity"
-        android:title="@string/preferences_debug_settings_task_continuity"
-        app:iconSpaceReserved="false" />
     <SwitchPreference
         android:defaultValue="false"
         android:key="@string/pref_key_enable_tabs_tray_to_compose"
@@ -35,6 +30,16 @@
         android:key="@string/pref_key_enable_shopping_experience"
         android:title="@string/preferences_debug_settings_shopping_experience"
         app:iconSpaceReserved="false" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/pref_key_enable_translations"
+        android:title="@string/preferences_debug_settings_translations"
+        app:iconSpaceReserved="false" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/pref_key_enable_fxsuggest"
+        android:title="@string/preferences_debug_settings_fxsuggest"
+        app:iconSpaceReserved="false" />
     <EditTextPreference
         android:key="@string/pref_key_custom_glean_server_url"
         android:title="@string/preferences_debug_settings_custom_glean_server_url"
diff --git a/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.png b/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.png
index 61076d47d..bd8103db9 100644
Binary files a/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.png and b/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.png b/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.png
index b32a29da0..fe9cb2268 100644
Binary files a/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.png and b/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.png b/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.png
index 731c52adb..f0657f9cb 100644
Binary files a/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.png and b/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.png b/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.png
index 170bb38ee..7a7c2b964 100644
Binary files a/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.png and b/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.png b/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.png
index 505d7fdea..8840a5057 100644
Binary files a/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.png and b/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.png b/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.png
index 05aedb479..cd31a2681 100644
Binary files a/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.png and b/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.png b/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.png
index 263fbdd65..4968ff580 100644
Binary files a/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.png and b/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.png b/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.png
index dcfbb24e6..874eebbb1 100644
Binary files a/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.png and b/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png b/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png
index 9feb1c472..2f724dcfd 100644
Binary files a/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png and b/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.png b/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.png
index 3ffef20f2..77746af31 100644
Binary files a/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.png and b/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/nightly/res/drawable/animated_splash_screen.xml b/app/src/nightly/res/drawable/animated_splash_screen.xml
index 255d27492..27301cb41 100644
--- a/app/src/nightly/res/drawable/animated_splash_screen.xml
+++ b/app/src/nightly/res/drawable/animated_splash_screen.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt" >
     <aapt:attr name="android:drawable">
diff --git a/app/src/nightly/res/drawable/ic_wordmark_text_normal.png b/app/src/nightly/res/drawable/ic_wordmark_text_normal.png
index 9298f730e..784f75acc 100644
Binary files a/app/src/nightly/res/drawable/ic_wordmark_text_normal.png and b/app/src/nightly/res/drawable/ic_wordmark_text_normal.png differ
diff --git a/app/src/nightly/res/drawable/ic_wordmark_text_private.png b/app/src/nightly/res/drawable/ic_wordmark_text_private.png
index 58afcc581..7cae75854 100644
Binary files a/app/src/nightly/res/drawable/ic_wordmark_text_private.png and b/app/src/nightly/res/drawable/ic_wordmark_text_private.png differ
diff --git a/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.png b/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.png
index 4cb02fda4..ad040413c 100644
Binary files a/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.png and b/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.png b/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.png
index 037e08be6..af4196b6e 100644
Binary files a/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.png and b/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/release/res/drawable-mdpi/ic_logo_wordmark_normal.png b/app/src/release/res/drawable-mdpi/ic_logo_wordmark_normal.png
index 193efde2d..d378e855c 100644
Binary files a/app/src/release/res/drawable-mdpi/ic_logo_wordmark_normal.png and b/app/src/release/res/drawable-mdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/release/res/drawable-mdpi/ic_logo_wordmark_private.png b/app/src/release/res/drawable-mdpi/ic_logo_wordmark_private.png
index c0f356d16..791d76835 100644
Binary files a/app/src/release/res/drawable-mdpi/ic_logo_wordmark_private.png and b/app/src/release/res/drawable-mdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_normal.png b/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_normal.png
index 7badabff9..c89456aca 100644
Binary files a/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_normal.png and b/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_private.png b/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_private.png
index 2573901b9..b4594f712 100644
Binary files a/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_private.png and b/app/src/release/res/drawable-xhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_normal.png b/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_normal.png
index 6a99dc263..f5a7c9be1 100644
Binary files a/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_normal.png and b/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_private.png b/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_private.png
index f3e888316..89f49c3d9 100644
Binary files a/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_private.png and b/app/src/release/res/drawable-xxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png b/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png
index 64afec5d2..c5592328d 100644
Binary files a/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png and b/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png differ
diff --git a/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_private.png b/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_private.png
index bb842f128..ab9368256 100644
Binary files a/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_private.png and b/app/src/release/res/drawable-xxxhdpi/ic_logo_wordmark_private.png differ
diff --git a/app/src/release/res/drawable/animated_splash_screen.xml b/app/src/release/res/drawable/animated_splash_screen.xml
index 184895b38..49ff2d4ab 100644
--- a/app/src/release/res/drawable/animated_splash_screen.xml
+++ b/app/src/release/res/drawable/animated_splash_screen.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt" >
     <aapt:attr name="android:drawable">
diff --git a/app/src/release/res/drawable/ic_wordmark_text_normal.png b/app/src/release/res/drawable/ic_wordmark_text_normal.png
index 16ef53a53..c5463b664 100644
Binary files a/app/src/release/res/drawable/ic_wordmark_text_normal.png and b/app/src/release/res/drawable/ic_wordmark_text_normal.png differ
diff --git a/app/src/release/res/drawable/ic_wordmark_text_private.png b/app/src/release/res/drawable/ic_wordmark_text_private.png
index 21e67c44a..2fbe9ced6 100644
Binary files a/app/src/release/res/drawable/ic_wordmark_text_private.png and b/app/src/release/res/drawable/ic_wordmark_text_private.png differ
diff --git a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
index d30adaa4e..4e6ca6a5d 100644
--- a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
@@ -105,7 +105,8 @@ class FenixApplicationTest {
         every { settings.adjustAdGroup } returns "group"
         every { settings.adjustCreative } returns "creative"
         every { settings.adjustNetwork } returns "network"
-        every { settings.searchWidgetInstalled } returns true
+        // Testing [settings.migrateSearchWidgetInstalledPrefIfNeeded]
+        settings.preferences.edit().putInt("pref_key_search_widget_installed", 5).apply()
         every { settings.openTabsCount } returns 1
         every { settings.topSitesSize } returns 2
         every { settings.installedAddonsCount } returns 3
@@ -143,6 +144,7 @@ class FenixApplicationTest {
         every { settings.showPocketRecommendationsFeature } returns true
         every { settings.showContileFeature } returns true
         every { application.reportHomeScreenMetrics(settings) } just Runs
+        every { application.getDeviceTotalRAM() } returns 7L
         every { settings.inactiveTabsAreEnabled } returns true
         every { application.isDeviceRamAboveThreshold } returns true
 
@@ -193,6 +195,7 @@ class FenixApplicationTest {
         assertEquals(expectedAppInstallSource, Metrics.installSource.testGetValue())
         assertEquals(true, Metrics.defaultWallpaper.testGetValue())
         assertEquals(true, Metrics.ramMoreThanThreshold.testGetValue())
+        assertEquals(7L, Metrics.deviceTotalRam.testGetValue())
 
         val contextId = TopSites.contextId.testGetValue()!!.toString()
 
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementFragmentTest.kt
index 8c57ee1c2..c56c1ac0c 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementFragmentTest.kt
@@ -6,15 +6,11 @@ package org.mozilla.fenix.addons
 
 import android.content.Context
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import io.mockk.CapturingSlot
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
-import mozilla.components.concept.engine.webextension.WebExtensionInstallException
 import mozilla.components.feature.addons.Addon
-import mozilla.components.feature.addons.AddonManager
-import mozilla.components.feature.addons.ui.translateName
 import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.R
@@ -38,7 +34,7 @@ class AddonsManagementFragmentTest {
         every { fragment.showErrorSnackBar(any()) } returns Unit
         every { fragment.getString(R.string.addon_not_supported_error) } returns addonNotSupportedErrorMessage
         every { fragment.getString(R.string.addon_already_installed) } returns addonAlreadyInstalledErrorMessage
-        every { fragment.getString(R.string.mozac_feature_addons_blocklisted) } returns addonAlreadyInstalledErrorMessage
+        every { fragment.getString(R.string.mozac_feature_addons_blocklisted_1) } returns addonAlreadyInstalledErrorMessage
     }
 
     @Test
@@ -61,24 +57,4 @@ class AddonsManagementFragmentTest {
         fragment.installExternalAddon(supportedAddons, "d1")
         verify { fragment.showErrorSnackBar(addonAlreadyInstalledErrorMessage) }
     }
-
-    @Test
-    fun `GIVEN add-on is installed  WHEN add-on is blocklisted THEN error is shown`() {
-        val addonManger = mockk<AddonManager>()
-        val addon = Addon("1")
-        val onError = CapturingSlot<((String, Throwable) -> Unit)>()
-        val expectedErrorMessage = fragment.getString(
-            R.string.mozac_feature_addons_blocklisted,
-            addon.translateName(context),
-        )
-
-        every { fragment.provideAccessibilityServicesEnabled() } returns false
-        every { fragment.provideAddonManger() } returns addonManger
-        every { addonManger.installAddon(addon, any(), capture(onError)) } returns mockk()
-
-        fragment.installAddon(addon)
-        onError.captured("", WebExtensionInstallException.Blocklisted(mockk()))
-
-        verify { fragment.showErrorSnackBar(expectedErrorMessage) }
-    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementViewTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementViewTest.kt
index 70129360f..e998ee47a 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/AddonsManagementViewTest.kt
@@ -31,10 +31,13 @@ class AddonsManagementViewTest {
     private var showPermissionDialog: (Addon) -> Unit = { permissionDialogDisplayed = true }
     private var permissionDialogDisplayed = false
 
+    private var onMoreAddonsButtonClicked: () -> Unit = { moreAddonsButtonClicked = true }
+    private var moreAddonsButtonClicked = false
+
     @Before
     fun setup() {
         MockKAnnotations.init(this)
-        managementView = AddonsManagementView(navController, showPermissionDialog)
+        managementView = AddonsManagementView(navController, showPermissionDialog, onMoreAddonsButtonClicked)
     }
 
     @Test
@@ -128,4 +131,10 @@ class AddonsManagementViewTest {
             navController.navigate(directionsEq(expected))
         }
     }
+
+    @Test
+    fun `onFindMoreAddonsButtonClicked calls onMoreAddonsButtonClicked`() {
+        managementView.onFindMoreAddonsButtonClicked()
+        assertTrue(moreAddonsButtonClicked)
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt b/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
index 4b48e12ae..315978e13 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
@@ -22,6 +22,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
+import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@@ -40,8 +41,7 @@ class ExtensionProcessDisabledControllerTest {
         val dialog: AlertDialog = mock()
         val appName = "TestApp"
         val builder: AlertDialog.Builder = mock()
-        val controller =
-            ExtensionProcessDisabledController(testContext, store, engine, builder, appName)
+        val controller = ExtensionProcessDisabledController(testContext, store, engine, builder, appName)
         val buttonsContainerCaptor = argumentCaptor<View>()
 
         controller.start()
@@ -74,8 +74,7 @@ class ExtensionProcessDisabledControllerTest {
         val appName = "TestApp"
         val dialog: AlertDialog = mock()
         val builder: AlertDialog.Builder = mock()
-        val controller =
-            ExtensionProcessDisabledController(testContext, store, engine, builder, appName)
+        val controller = ExtensionProcessDisabledController(testContext, store, engine, builder, appName)
         val buttonsContainerCaptor = argumentCaptor<View>()
 
         controller.start()
@@ -100,4 +99,36 @@ class ExtensionProcessDisabledControllerTest {
         verify(engine, never()).enableExtensionProcessSpawning()
         verify(dialog).dismiss()
     }
+
+    @Test
+    fun `WHEN dispatching the same event twice THEN the dialog should only be created once`() {
+        val store = BrowserStore()
+        val engine: Engine = mock()
+        val appName = "TestApp"
+        val dialog: AlertDialog = mock()
+        val builder: AlertDialog.Builder = mock()
+        val controller = ExtensionProcessDisabledController(testContext, store, engine, builder, appName)
+        val buttonsContainerCaptor = argumentCaptor<View>()
+
+        controller.start()
+
+        whenever(builder.show()).thenReturn(dialog)
+
+        // First dispatch...
+        store.dispatch(ExtensionProcessDisabledPopupAction(showPopup = true))
+        dispatcher.scheduler.advanceUntilIdle()
+        store.waitUntilIdle()
+
+        // Second dispatch... without having dismissed the dialog before!
+        store.dispatch(ExtensionProcessDisabledPopupAction(showPopup = true))
+        dispatcher.scheduler.advanceUntilIdle()
+        store.waitUntilIdle()
+
+        verify(builder).setView(buttonsContainerCaptor.capture())
+        verify(builder, times(1)).show()
+
+        // Click a button to dismiss the dialog.
+        buttonsContainerCaptor.value.findViewById<Button>(R.id.negative).performClick()
+        store.waitUntilIdle()
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt
index 8f1cc4c60..a1b479048 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt
@@ -15,6 +15,7 @@ import io.mockk.verify
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import mozilla.components.browser.state.action.ContentAction
+import mozilla.components.browser.state.action.ShoppingProductAction
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.TabSessionState
@@ -34,6 +35,7 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.TrackingProtection
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.shopping.ShoppingExperienceFeature
 import org.mozilla.fenix.utils.Settings
 
 @RunWith(FenixRobolectricTestRunner::class)
@@ -55,7 +57,7 @@ class BrowserToolbarCFRPresenterTest {
 
         presenter.start()
 
-        assertNotNull(presenter.tcpCfrScope)
+        assertNotNull(presenter.scope)
 
         browserStore.dispatch(ContentAction.UpdateProgressAction(customTab.id, 0)).joinBlocking()
         verify(exactly = 0) { presenter.showTcpCfr() }
@@ -78,7 +80,7 @@ class BrowserToolbarCFRPresenterTest {
 
         presenter.start()
 
-        assertNotNull(presenter.tcpCfrScope)
+        assertNotNull(presenter.scope)
 
         browserStore.dispatch(ContentAction.UpdateProgressAction(normalTab.id, 1)).joinBlocking()
         verify(exactly = 0) { presenter.showTcpCfr() }
@@ -101,7 +103,7 @@ class BrowserToolbarCFRPresenterTest {
 
         presenter.start()
 
-        assertNotNull(presenter.tcpCfrScope)
+        assertNotNull(presenter.scope)
 
         browserStore.dispatch(ContentAction.UpdateProgressAction(privateTab.id, 14)).joinBlocking()
         verify(exactly = 0) { presenter.showTcpCfr() }
@@ -124,7 +126,7 @@ class BrowserToolbarCFRPresenterTest {
 
         presenter.start()
 
-        assertNotNull(presenter.tcpCfrScope)
+        assertNotNull(presenter.scope)
 
         browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 99)).joinBlocking()
         browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
@@ -134,34 +136,64 @@ class BrowserToolbarCFRPresenterTest {
     }
 
     @Test
-    fun `GIVEN the TCP CFR should not be shown WHEN the feature starts THEN don't observe the store for updates`() {
+    fun `GIVEN the Erase CFR should be shown WHEN in private mode and the current tab is fully loaded THEN the Erase CFR is only shown once`() {
+        val tab = createTab(url = "", private = true)
+
+        val browserStore = createBrowserStore(
+            tab = tab,
+            selectedTabId = tab.id,
+        )
+
+        val presenter = createPresenterThatShowsCFRs(
+            browserStore = browserStore,
+            settings = mockk {
+                every { shouldShowEraseActionCFR } returns true
+            },
+            isPrivate = true,
+        )
+
+        presenter.start()
+
+        assertNotNull(presenter.scope)
+
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 99)).joinBlocking()
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
+        verify { presenter.showEraseCfr() }
+    }
+
+    @Test
+    fun `GIVEN no CFR shown WHEN the feature starts THEN don't observe the store for updates`() {
         val presenter = createPresenter(
             settings = mockk {
                 every { shouldShowTotalCookieProtectionCFR } returns false
                 every { shouldShowCookieBannerReEngagementDialog() } returns false
+                every { shouldShowReviewQualityCheckCFR } returns false
+                every { shouldShowEraseActionCFR } returns false
             },
         )
 
         presenter.start()
 
-        assertNull(presenter.tcpCfrScope)
+        assertNull(presenter.scope)
     }
 
     @Test
     fun `GIVEN the store is observed for updates WHEN the presenter is stopped THEN stop observing the store`() {
-        val tcpScope: CoroutineScope = mockk {
+        val scope: CoroutineScope = mockk {
             every { cancel() } just Runs
         }
         val presenter = createPresenter()
-        presenter.tcpCfrScope = tcpScope
+        presenter.scope = scope
 
         presenter.stop()
 
-        verify { tcpScope.cancel() }
+        verify { scope.cancel() }
     }
 
     @Test
-    fun `WHEN the TCP CFR is to be shown THEN instantiate a new one and remember to not show it again`() {
+    fun `WHEN the TCP CFR is to be shown THEN instantiate a new one and remember show it again unless explicitly dismissed`() {
         val settings: Settings = mockk(relaxed = true)
         val presenter = createPresenter(
             anchor = mockk(relaxed = true),
@@ -170,8 +202,8 @@ class BrowserToolbarCFRPresenterTest {
 
         presenter.showTcpCfr()
 
-        verify { settings.shouldShowTotalCookieProtectionCFR = false }
-        assertNotNull(presenter.tcpCfrPopup)
+        verify(exactly = 0) { settings.shouldShowTotalCookieProtectionCFR = false }
+        assertNotNull(presenter.popup)
     }
 
     @Test
@@ -187,6 +219,77 @@ class BrowserToolbarCFRPresenterTest {
         assertNotNull(TrackingProtection.tcpCfrShown.testGetValue())
     }
 
+    @Test
+    fun `GIVEN the current tab is showing a product page WHEN the tab is not loading THEN the CFR is shown`() {
+        val tab = createTab(url = "")
+        val browserStore = createBrowserStore(
+            tab = tab,
+            selectedTabId = tab.id,
+        )
+        val presenter = createPresenter(
+            browserStore = browserStore,
+            settings = mockk {
+                every { shouldShowTotalCookieProtectionCFR } returns false
+                every { shouldShowReviewQualityCheckCFR } returns true
+                every { reviewQualityCheckOptInTimeInMillis } returns System.currentTimeMillis()
+                every { shouldShowEraseActionCFR } returns false
+            },
+        )
+        every { presenter.showShoppingCFR(any()) } just Runs
+
+        presenter.start()
+
+        assertNotNull(presenter.scope)
+
+        browserStore.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, true)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(false)) }
+
+        browserStore.dispatch(ShoppingProductAction.UpdateProductUrlStatusAction(tab.id, true)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(false)) }
+
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(false)) }
+
+        browserStore.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, false)).joinBlocking()
+        verify { presenter.showShoppingCFR(eq(false)) }
+    }
+
+    @Test
+    fun `GIVEN the user opted in the shopping feature AND the opted in shopping CFR should be shown WHEN the tab is not loading THEN the CFR is shown`() {
+        val tab = createTab(url = "")
+        val browserStore = createBrowserStore(
+            tab = tab,
+            selectedTabId = tab.id,
+        )
+
+        val presenter = createPresenter(
+            settings = mockk {
+                every { shouldShowTotalCookieProtectionCFR } returns false
+                every { shouldShowReviewQualityCheckCFR } returns true
+                every { shouldShowEraseActionCFR } returns false
+                every { reviewQualityCheckOptInTimeInMillis } returns System.currentTimeMillis() - Settings.TWO_DAYS_MS
+            },
+            browserStore = browserStore,
+        )
+        every { presenter.showShoppingCFR(any()) } just Runs
+
+        presenter.start()
+
+        assertNotNull(presenter.scope)
+
+        browserStore.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, true)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(true)) }
+
+        browserStore.dispatch(ShoppingProductAction.UpdateProductUrlStatusAction(tab.id, true)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(true)) }
+
+        browserStore.dispatch(ContentAction.UpdateProgressAction(tab.id, 100)).joinBlocking()
+        verify(exactly = 0) { presenter.showShoppingCFR(eq(true)) }
+
+        browserStore.dispatch(ContentAction.UpdateLoadingStateAction(tab.id, false)).joinBlocking()
+        verify { presenter.showShoppingCFR(eq(true)) }
+    }
+
     /**
      * Creates and return a [spyk] of a [BrowserToolbarCFRPresenter] that can handle actually showing CFRs.
      */
@@ -197,11 +300,16 @@ class BrowserToolbarCFRPresenterTest {
         settings: Settings = mockk {
             every { shouldShowTotalCookieProtectionCFR } returns true
             every { shouldShowCookieBannerReEngagementDialog() } returns false
+            every { shouldShowReviewQualityCheckCFR } returns false
+            every { shouldShowEraseActionCFR } returns false
         },
         toolbar: BrowserToolbar = mockk(),
+        isPrivate: Boolean = false,
         sessionId: String? = null,
-    ) = spyk(createPresenter(context, anchor, browserStore, settings, toolbar, sessionId)) {
+    ) = spyk(createPresenter(context, anchor, browserStore, settings, toolbar, sessionId, isPrivate)) {
         every { showTcpCfr() } just Runs
+        every { showShoppingCFR(any()) } just Runs
+        every { showEraseCfr() } just Runs
     }
 
     /**
@@ -212,17 +320,26 @@ class BrowserToolbarCFRPresenterTest {
         context: Context = mockk {
             every { getString(R.string.tcp_cfr_message) } returns "Test"
             every { getColor(any()) } returns 0
+            every { getString(R.string.pref_key_should_show_review_quality_cfr) } returns "test"
         },
-        anchor: View = mockk(),
+        anchor: View = mockk(relaxed = true),
         browserStore: BrowserStore = mockk(),
         settings: Settings = mockk(relaxed = true) {
             every { shouldShowTotalCookieProtectionCFR } returns true
             every { shouldShowCookieBannerReEngagementDialog() } returns false
+            every { shouldShowEraseActionCFR } returns true
+            every { shouldShowReviewQualityCheckCFR } returns true
         },
         toolbar: BrowserToolbar = mockk {
             every { findViewById<View>(R.id.mozac_browser_toolbar_security_indicator) } returns anchor
+            every { findViewById<View>(R.id.mozac_browser_toolbar_page_actions) } returns anchor
+            every { findViewById<View>(R.id.mozac_browser_toolbar_navigation_actions) } returns anchor
         },
         sessionId: String? = null,
+        isPrivate: Boolean = false,
+        shoppingExperienceFeature: ShoppingExperienceFeature = mockk {
+            every { isEnabled } returns true
+        },
     ) = spyk(
         BrowserToolbarCFRPresenter(
             context = context,
@@ -230,6 +347,8 @@ class BrowserToolbarCFRPresenterTest {
             settings = settings,
             toolbar = toolbar,
             sessionId = sessionId,
+            isPrivate = isPrivate,
+            shoppingExperienceFeature = shoppingExperienceFeature,
         ),
     )
 
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index ce652ca7b..0d3376590 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -53,6 +53,7 @@ import org.mozilla.fenix.browser.readermode.ReaderModeController
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.home.HomeScreenViewModel
 
 @RunWith(FenixRobolectricTestRunner::class)
@@ -366,6 +367,17 @@ class DefaultBrowserToolbarControllerTest {
         assertNotNull(Events.browserToolbarHomeTapped.testGetValue())
     }
 
+    @Test
+    fun handleEraseButtonClicked() {
+        val controller = createController()
+        controller.handleEraseButtonClick()
+
+        verify {
+            homeViewModel.sessionToDelete = HomeFragment.ALL_PRIVATE_TABS
+            navController.navigate(BrowserFragmentDirections.actionGlobalHome())
+        }
+    }
+
     private fun createController(
         activity: HomeActivity = this.activity,
         customTabSessionId: String? = null,
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt
index e68d763ad..f6a4107db 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt
@@ -80,4 +80,11 @@ class DefaultBrowserToolbarInteractorTest {
 
         verify { browserToolbarController.handleHomeButtonClick() }
     }
+
+    @Test
+    fun onEraseButtonClicked() {
+        interactor.onEraseButtonClicked()
+
+        verify { browserToolbarController.handleEraseButtonClick() }
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
index c109deab8..8370922f9 100644
--- a/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
@@ -11,8 +11,10 @@ import io.mockk.runs
 import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.browser.state.action.WebExtensionAction.UpdatePromptRequestWebExtensionAction
-import mozilla.components.browser.state.state.extension.WebExtensionPromptRequest.Permissions
+import mozilla.components.browser.state.state.extension.WebExtensionPromptRequest
 import mozilla.components.browser.state.store.BrowserStore
+import mozilla.components.concept.engine.webextension.WebExtensionInstallException
+import mozilla.components.support.ktx.android.content.appVersionName
 import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
@@ -20,6 +22,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 
 @RunWith(FenixRobolectricTestRunner::class)
@@ -37,27 +40,180 @@ class WebExtensionPromptFeatureTest {
         webExtensionPromptFeature = spyk(
             WebExtensionPromptFeature(
                 store = store,
-                provideAddons = { emptyList() },
                 context = testContext,
-                snackBarParentView = mockk(relaxed = true),
                 fragmentManager = mockk(relaxed = true),
             ),
         )
     }
 
     @Test
-    fun `WHEN add-on is not found THEN unsupported error message is shown`() {
-        val onConfirm = mockk<(Boolean) -> Unit>(relaxed = true)
-        every { webExtensionPromptFeature.consumePromptRequest() } just runs
-        every { webExtensionPromptFeature.showUnsupportedError() } returns mockk()
-
+    fun `WHEN InstallationFailed is dispatched THEN handleInstallationFailedRequest is called`() {
         webExtensionPromptFeature.start()
 
-        // Passing a mocked WebExtension instance here will result in no add-on being found.
-        store.dispatch(UpdatePromptRequestWebExtensionAction(Permissions(mockk(), onConfirm))).joinBlocking()
+        every { webExtensionPromptFeature.handleInstallationFailedRequest(any()) } just runs
+
+        store.dispatch(
+            UpdatePromptRequestWebExtensionAction(
+                WebExtensionPromptRequest.BeforeInstallation.InstallationFailed(
+                    mockk(),
+                    mockk(),
+                ),
+            ),
+        ).joinBlocking()
+
+        verify { webExtensionPromptFeature.handleInstallationFailedRequest(any()) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with network error THEN showDialog with the correct message`() {
+        val expectedTitle =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val exception = WebExtensionInstallException.NetworkFailure(
+            extensionName = "name",
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(
+                R.string.mozac_feature_addons_failed_to_install_network_error,
+                "name",
+            )
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with Blocklisted error THEN showDialog with the correct message`() {
+        val expectedTitle =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val extensionName = "extensionName"
+        val exception = WebExtensionInstallException.Blocklisted(
+            extensionName = extensionName,
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_blocklisted_1, extensionName)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with UserCancelled error THEN do not showDialog`() {
+        val expectedTitle = ""
+        val extensionName = "extensionName"
+        val exception = WebExtensionInstallException.UserCancelled(
+            extensionName = extensionName,
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, extensionName)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify(exactly = 0) { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with Unknown error THEN showDialog with the correct message`() {
+        val expectedTitle = ""
+        val extensionName = "extensionName"
+        val exception = WebExtensionInstallException.Unknown(
+            extensionName = extensionName,
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, extensionName)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with Unknown error and no extension name THEN showDialog with the correct message`() {
+        val expectedTitle = ""
+        val exception = WebExtensionInstallException.Unknown(
+            extensionName = null,
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install_generic)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with CorruptFile error THEN showDialog with the correct message`() {
+        val expectedTitle =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val exception = WebExtensionInstallException.CorruptFile(
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install_corrupt_error)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with NotSigned error THEN showDialog with the correct message`() {
+        val expectedTitle =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val exception = WebExtensionInstallException.NotSigned(
+            throwable = Exception(),
+        )
+        val expectedMessage =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install_not_signed_error)
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
+
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
+    }
+
+    @Test
+    fun `WHEN calling handleInstallationFailedRequest with Incompatible error THEN showDialog with the correct message`() {
+        val expectedTitle =
+            testContext.getString(R.string.mozac_feature_addons_failed_to_install, "")
+        val extensionName = "extensionName"
+        val exception = WebExtensionInstallException.Incompatible(
+            extensionName = extensionName,
+            throwable = Exception(),
+        )
+        val appName = testContext.getString(R.string.app_name)
+        val version = testContext.appVersionName
+        val expectedMessage =
+            testContext.getString(
+                R.string.mozac_feature_addons_failed_to_install_incompatible_error,
+                extensionName,
+                appName,
+                version,
+            )
+
+        webExtensionPromptFeature.handleInstallationFailedRequest(
+            exception = exception,
+        )
 
-        verify { onConfirm(false) }
-        verify { webExtensionPromptFeature.consumePromptRequest() }
-        verify { webExtensionPromptFeature.showUnsupportedError() }
+        verify { webExtensionPromptFeature.showDialog(expectedTitle, expectedMessage) }
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt b/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
index b6de27749..14f176c8e 100644
--- a/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/TabCounterViewTest.kt
@@ -9,6 +9,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
+import io.mockk.verifyOrder
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
@@ -31,6 +32,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
 import org.mozilla.fenix.browser.browsingmode.DefaultBrowsingModeManager
 import org.mozilla.fenix.ext.nav
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
 
@@ -103,6 +105,8 @@ class TabCounterViewTest {
 
     @Test
     fun `WHEN tab counter is updated THEN set the tab counter to the correct number of tabs`() {
+        every { testContext.settings() } returns settings
+
         val browserState = BrowserState(
             tabs = listOf(
                 createTab(url = "https://www.mozilla.org", id = "mozilla"),
@@ -126,4 +130,45 @@ class TabCounterViewTest {
             tabCounter.setCountWithAnimation(browserState.privateTabs.size)
         }
     }
+
+    @Test
+    fun `WHEN state updated while in private mode THEN call toggleCounterMask(true)`() {
+        every { settings.feltPrivateBrowsingEnabled } returns true
+        every { testContext.settings() } returns settings
+        val browserState = BrowserState(
+            tabs = listOf(
+                createTab(url = "https://www.mozilla.org", id = "mozilla"),
+                createTab(url = "https://www.firefox.com", id = "firefox"),
+                createTab(url = "https://getpocket.com", private = true, id = "getpocket"),
+            ),
+            selectedTabId = "mozilla",
+        )
+
+        browsingModeManager.mode = BrowsingMode.Private
+        tabCounterView.update(browserState)
+
+        verifyOrder {
+            tabCounter.toggleCounterMask(true)
+        }
+    }
+
+    @Test
+    fun `WHEN state updated while in normal mode THEN call toggleCounterMask(false)`() {
+        every { settings.feltPrivateBrowsingEnabled } returns true
+        every { testContext.settings() } returns settings
+        val browserState = BrowserState(
+            tabs = listOf(
+                createTab(url = "https://www.mozilla.org", id = "mozilla"),
+                createTab(url = "https://www.firefox.com", id = "firefox"),
+                createTab(url = "https://getpocket.com", private = true, id = "getpocket"),
+            ),
+            selectedTabId = "mozilla",
+        )
+
+        tabCounterView.update(browserState)
+
+        verifyOrder {
+            tabCounter.toggleCounterMask(false)
+        }
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt
index 40c259bf1..dae2a0598 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryFragmentStoreTest.kt
@@ -185,6 +185,30 @@ class HistoryFragmentStoreTest {
         assertTrue(store.state.mode.selectedItems.contains(historyItem))
     }
 
+    @Test
+    fun `GIVEN mode is editing WHEN back pressed THEN mode becomes normal`() {
+        val store = HistoryFragmentStore(
+            emptyDefaultState().copy(
+                mode = HistoryFragmentState.Mode.Editing(
+                    setOf(),
+                ),
+            ),
+        )
+
+        store.dispatch(HistoryFragmentAction.BackPressed).joinBlocking()
+
+        assertEquals(HistoryFragmentState.Mode.Normal, store.state.mode)
+    }
+
+    @Test
+    fun `GIVEN mode is not editing WHEN back pressed THEN does not change`() {
+        val store = HistoryFragmentStore(emptyDefaultState().copy(mode = HistoryFragmentState.Mode.Syncing))
+
+        store.dispatch(HistoryFragmentAction.BackPressed).joinBlocking()
+
+        assertEquals(HistoryFragmentState.Mode.Syncing, store.state.mode)
+    }
+
     private fun emptyDefaultState(): HistoryFragmentState = HistoryFragmentState(
         items = listOf(),
         mode = HistoryFragmentState.Mode.Normal,
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt
index d2d5c38f1..42d6e2488 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryNavigationMiddlewareTest.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.library.history.state
 
 import androidx.navigation.NavController
+import androidx.navigation.NavOptions
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import mozilla.components.support.test.any
@@ -17,8 +18,10 @@ import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mockito.verify
+import org.mozilla.fenix.R
 import org.mozilla.fenix.library.history.History
 import org.mozilla.fenix.library.history.HistoryFragmentAction
+import org.mozilla.fenix.library.history.HistoryFragmentDirections
 import org.mozilla.fenix.library.history.HistoryFragmentState
 import org.mozilla.fenix.library.history.HistoryFragmentStore
 import org.mozilla.fenix.library.history.HistoryItemTimeGroup
@@ -39,6 +42,7 @@ class HistoryNavigationMiddlewareTest {
                     openedInBrowser = true
                 }
             },
+            onBackPressed = { },
             scope = this,
         )
         val store =
@@ -62,6 +66,7 @@ class HistoryNavigationMiddlewareTest {
                     openedInBrowser = true
                 }
             },
+            onBackPressed = { },
             scope = this,
         )
         val state = HistoryFragmentState.initial.copy(
@@ -85,6 +90,7 @@ class HistoryNavigationMiddlewareTest {
         val middleware = HistoryNavigationMiddleware(
             navController = navController,
             openToBrowser = { },
+            onBackPressed = { },
             scope = this,
         )
         val store =
@@ -98,4 +104,68 @@ class HistoryNavigationMiddlewareTest {
             navOptions = any(),
         )
     }
+
+    @Test
+    fun `WHEN recently closed is requested to be entered THEN nav controller navigates to it`() = runTest {
+        val navController = mock<NavController>()
+        val middleware = HistoryNavigationMiddleware(
+            navController = navController,
+            openToBrowser = { },
+            onBackPressed = { },
+            scope = this,
+        )
+        val store =
+            HistoryFragmentStore(HistoryFragmentState.initial, middleware = listOf(middleware))
+
+        store.dispatch(HistoryFragmentAction.EnterRecentlyClosed).joinBlocking()
+        advanceUntilIdle()
+
+        verify(navController).navigate(
+            HistoryFragmentDirections.actionGlobalRecentlyClosed(),
+            NavOptions.Builder().setPopUpTo(R.id.recentlyClosedFragment, true).build(),
+        )
+    }
+
+    @Test
+    fun `GIVEN mode is editing WHEN back pressed THEN no navigation happens`() = runTest {
+        var onBackPressed = false
+        val middleware = HistoryNavigationMiddleware(
+            navController = mock(),
+            openToBrowser = { },
+            onBackPressed = { onBackPressed = true },
+            scope = this,
+        )
+        val store =
+            HistoryFragmentStore(
+                HistoryFragmentState.initial.copy(
+                    mode = HistoryFragmentState.Mode.Editing(
+                        setOf(),
+                    ),
+                ),
+                middleware = listOf(middleware),
+            )
+
+        store.dispatch(HistoryFragmentAction.BackPressed).joinBlocking()
+        advanceUntilIdle()
+
+        assertFalse(onBackPressed)
+    }
+
+    @Test
+    fun `GIVEN mode is not editing WHEN back pressed THEN onBackPressed callback invoked`() = runTest {
+        var onBackPressed = false
+        val middleware = HistoryNavigationMiddleware(
+            navController = mock(),
+            openToBrowser = { },
+            onBackPressed = { onBackPressed = true },
+            scope = this,
+        )
+        val store =
+            HistoryFragmentStore(HistoryFragmentState.initial, middleware = listOf(middleware))
+
+        store.dispatch(HistoryFragmentAction.BackPressed).joinBlocking()
+        advanceUntilIdle()
+
+        assertTrue(onBackPressed)
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddlewareTest.kt
index 4872d471c..d4f5a02a1 100644
--- a/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/history/state/HistoryTelemetryMiddlewareTest.kt
@@ -12,6 +12,7 @@ import org.junit.Assert.assertNull
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.library.history.History
 import org.mozilla.fenix.library.history.HistoryFragmentAction
 import org.mozilla.fenix.library.history.HistoryFragmentState
@@ -108,4 +109,16 @@ class HistoryTelemetryMiddlewareTest {
 
         assertNotNull(GleanHistory.removedAll.testGetValue())
     }
+
+    @Test
+    fun `GIVEN recently closed is requested to be entered THEN telemetry recorded`() {
+        val store = HistoryFragmentStore(
+            initialState = HistoryFragmentState.initial,
+            middleware = listOf(middleware),
+        )
+
+        store.dispatch(HistoryFragmentAction.EnterRecentlyClosed).joinBlocking()
+
+        assertNotNull(Events.recentlyClosedTabsOpened.testGetValue())
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/library/history/state/bindings/MenuBindingTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/state/bindings/MenuBindingTest.kt
new file mode 100644
index 000000000..4ea81c20f
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/library/history/state/bindings/MenuBindingTest.kt
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.library.history.state.bindings
+
+import mozilla.components.support.test.ext.joinBlocking
+import mozilla.components.support.test.rule.MainCoroutineRule
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.library.history.HistoryFragmentAction
+import org.mozilla.fenix.library.history.HistoryFragmentState
+import org.mozilla.fenix.library.history.HistoryFragmentStore
+
+class MenuBindingTest {
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule()
+
+    @Test
+    fun `WHEN the mode is updated THEN the menu is invalidated`() {
+        var menuInvalidated = false
+        val store = HistoryFragmentStore(HistoryFragmentState.initial.copy(mode = HistoryFragmentState.Mode.Syncing))
+        val binding = MenuBinding(
+            store = store,
+            invalidateOptionsMenu = { menuInvalidated = true },
+        )
+
+        binding.start()
+        store.dispatch(HistoryFragmentAction.FinishSync).joinBlocking()
+
+        assertTrue(menuInvalidated)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
index 1bdd24e80..504e012be 100644
--- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
@@ -425,6 +425,30 @@ class SearchDialogControllerTest {
         verify { store.dispatch(SearchFragmentAction.ShowSearchShortcutEnginePicker(false)) }
     }
 
+    @Test
+    fun `WHEN felt privacy is enabled THEN do not dispatch AllowSearchSuggestionsInPrivateModePrompt`() {
+        every { settings.feltPrivateBrowsingEnabled } returns true
+
+        val text = "mozilla"
+
+        createController().handleTextChanged(text)
+        val actionSlot = mutableListOf<SearchFragmentAction>()
+        verify { store.dispatch(capture(actionSlot)) }
+        assertFalse(actionSlot.any { it is SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt })
+    }
+
+    @Test
+    fun `WHEN felt privacy is disabled THEN dispatch AllowSearchSuggestionsInPrivateModePrompt`() {
+        every { settings.feltPrivateBrowsingEnabled } returns false
+
+        val text = "mozilla"
+
+        createController().handleTextChanged(text)
+        val actionSlot = mutableListOf<SearchFragmentAction>()
+        verify { store.dispatch(capture(actionSlot)) }
+        assertTrue(actionSlot.any { it is SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt })
+    }
+
     @Test
     fun handleUrlTapped() {
         val url = "https://www.google.com/"
diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
index 3a55e35a4..fa2bd61e8 100644
--- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
@@ -24,6 +24,7 @@ import mozilla.components.feature.awesomebar.provider.SearchEngineSuggestionProv
 import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SearchTermSuggestionsProvider
 import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider
+import mozilla.components.feature.fxsuggest.FxSuggestSuggestionProvider
 import mozilla.components.feature.syncedtabs.SyncedTabsStorageSuggestionProvider
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import org.junit.After
@@ -65,6 +66,7 @@ class AwesomeBarViewTest {
         every { any<Activity>().components.backgroundServices.syncedTabsStorage } returns mockk()
         every { any<Activity>().components.core.store.state.search } returns mockk(relaxed = true)
         every { any<Activity>().components.core.store.state.search } returns mockk(relaxed = true)
+        every { any<Activity>().settings() } returns mockk(relaxed = true)
         every { any<Activity>().getColorFromAttr(any()) } returns 0
         every { AwesomeBarView.Companion.getDrawable(any(), any()) } returns mockk<VectorDrawable>(relaxed = true) {
             every { intrinsicWidth } returns 10
@@ -1044,6 +1046,46 @@ class AwesomeBarViewTest {
 
         assertEquals(1, result.filterIsInstance<SearchTermSuggestionsProvider>().size)
     }
+
+    @Test
+    fun `GIVEN Firefox Suggest is enabled WHEN the view is created THEN configure the Firefox Suggest suggestion provider`() {
+        val settings: Settings = mockk(relaxed = true) {
+            every { enableFxSuggest } returns true
+        }
+        every { activity.settings() } returns settings
+        val awesomeBarView = AwesomeBarView(
+            activity = activity,
+            interactor = mockk(),
+            view = mockk(),
+            fromHomeFragment = false,
+        )
+        val state = getSearchProviderState()
+
+        val result = awesomeBarView.getProvidersToAdd(state)
+
+        val fxSuggestProvider = result.firstOrNull { it is FxSuggestSuggestionProvider }
+        assertNotNull(fxSuggestProvider)
+    }
+
+    @Test
+    fun `GIVEN Firefox Suggest is disabled WHEN the view is created THEN don't configure the Firefox Suggest suggestion provider`() {
+        val settings: Settings = mockk(relaxed = true) {
+            every { enableFxSuggest } returns false
+        }
+        every { activity.settings() } returns settings
+        val awesomeBarView = AwesomeBarView(
+            activity = activity,
+            interactor = mockk(),
+            view = mockk(),
+            fromHomeFragment = false,
+        )
+        val state = getSearchProviderState()
+
+        val result = awesomeBarView.getProvidersToAdd(state)
+
+        val fxSuggestProvider = result.firstOrNull { it is FxSuggestSuggestionProvider }
+        assertNull(fxSuggestProvider)
+    }
 }
 
 /**
diff --git a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
index ca73b2b23..31d8e2002 100644
--- a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
@@ -144,6 +144,7 @@ class ToolbarViewTest {
     fun `GIVEN search term is set WHEN switching to edit mode THEN the cursor is set at the end of the search term`() {
         every { context.settings().showUnifiedSearchFeature } returns true
         every { context.settings().shouldShowHistorySuggestions } returns true
+        every { context.settings().shouldShowBookmarkSuggestions } returns true
         val view = buildToolbarView(false)
         mockkObject(FeatureFlags)
 
@@ -158,6 +159,7 @@ class ToolbarViewTest {
     fun `GIVEN no search term is set WHEN switching to edit mode THEN the cursor is set at the end of the search term`() {
         every { context.settings().showUnifiedSearchFeature } returns true
         every { context.settings().shouldShowHistorySuggestions } returns true
+        every { context.settings().shouldShowBookmarkSuggestions } returns true
         val view = buildToolbarView(false)
         mockkObject(FeatureFlags)
 
@@ -786,6 +788,74 @@ class ToolbarViewTest {
         }
     }
 
+    @Test
+    fun `GIVEN show bookmark suggestions and unified search are both enabled WHEN the toolbar view is initialized THEN add bookmark storage to autocomplete providers`() {
+        mockkConstructor(ToolbarAutocompleteFeature::class) {
+            val historyProvider: PlacesHistoryStorage = mockk(relaxed = true)
+            val bookmarksStorage: PlacesBookmarksStorage = mockk(relaxed = true)
+            val domainsProvider: BaseDomainAutocompleteProvider = mockk(relaxed = true)
+            val components: Components = mockk(relaxed = true) {
+                every { core.historyStorage } returns historyProvider
+                every { core.domainsAutocompleteProvider } returns domainsProvider
+                every { core.bookmarksStorage } returns bookmarksStorage
+            }
+
+            val settings: Settings = mockk(relaxed = true) {
+                every { showUnifiedSearchFeature } returns true
+                every { shouldShowHistorySuggestions } returns true
+                every { shouldShowBookmarkSuggestions } returns true
+            }
+            val toolbarView = buildToolbarView(
+                isPrivate = false,
+                settings = settings,
+                components = components,
+            )
+
+            toolbarView.update(defaultState)
+
+            verify {
+                toolbarView.autocompleteFeature.updateAutocompleteProviders(
+                    providers = listOf(historyProvider, bookmarksStorage, domainsProvider),
+                    refreshAutocomplete = true,
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `GIVEN show bookmark suggestions is disabled and unified search is enabled WHEN the toolbar view is initialized THEN don't add bookmark storage to autocomplete providers`() {
+        mockkConstructor(ToolbarAutocompleteFeature::class) {
+            val historyProvider: PlacesHistoryStorage = mockk(relaxed = true)
+            val bookmarksStorage: PlacesBookmarksStorage = mockk(relaxed = true)
+            val domainsProvider: BaseDomainAutocompleteProvider = mockk(relaxed = true)
+            val components: Components = mockk(relaxed = true) {
+                every { core.historyStorage } returns historyProvider
+                every { core.domainsAutocompleteProvider } returns domainsProvider
+                every { core.bookmarksStorage } returns bookmarksStorage
+            }
+
+            val settings: Settings = mockk(relaxed = true) {
+                every { showUnifiedSearchFeature } returns true
+                every { shouldShowHistorySuggestions } returns true
+                every { shouldShowBookmarkSuggestions } returns false
+            }
+            val toolbarView = buildToolbarView(
+                isPrivate = false,
+                settings = settings,
+                components = components,
+            )
+
+            toolbarView.update(defaultState)
+
+            verify {
+                toolbarView.autocompleteFeature.updateAutocompleteProviders(
+                    providers = listOf(historyProvider, domainsProvider),
+                    refreshAutocomplete = true,
+                )
+            }
+        }
+    }
+
     private fun buildToolbarView(
         isPrivate: Boolean,
         settings: Settings = context.settings(),
diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt
index 6217a5581..4ec21aebc 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.quicksettings
 
+import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
 import io.mockk.MockKAnnotations
@@ -32,6 +33,7 @@ class ProtectionsViewTest {
     private lateinit var view: ProtectionsView
     private lateinit var binding: QuicksettingsProtectionsPanelBinding
     private lateinit var interactor: ProtectionsInteractor
+    private var trackingProtectionDivider: View = spyk(View(testContext))
 
     @MockK(relaxed = true)
     private lateinit var settings: Settings
@@ -40,7 +42,14 @@ class ProtectionsViewTest {
     fun setup() {
         MockKAnnotations.init(this)
         interactor = mockk(relaxed = true)
-        view = spyk(ProtectionsView(FrameLayout(testContext), interactor, settings))
+        view = spyk(
+            ProtectionsView(
+                FrameLayout(testContext),
+                trackingProtectionDivider,
+                interactor,
+                settings,
+            ),
+        )
         binding = view.binding
     }
 
@@ -160,4 +169,25 @@ class ProtectionsViewTest {
 
         assertTrue(binding.trackingProtectionDetails.isVisible)
     }
+
+    @Test
+    fun `WHEN all the views from protectionView are gone THEN tracking protection divider is gone`() {
+        val websiteUrl = "https://mozilla.org"
+        val state = ProtectionsState(
+            tab = createTab(url = websiteUrl),
+            url = websiteUrl,
+            isTrackingProtectionEnabled = false,
+            cookieBannerUIMode = CookieBannerUIMode.HIDE,
+            listTrackers = listOf(),
+            mode = ProtectionsState.Mode.Normal,
+            lastAccessedCategory = "",
+        )
+
+        every { settings.shouldShowCookieBannerUI } returns true
+        every { settings.shouldUseCookieBanner } returns true
+
+        view.update(state)
+
+        assertFalse(trackingProtectionDivider.isVisible)
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt
index c69f4b9fb..236a8d547 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/search/SearchEngineFragmentTest.kt
@@ -89,6 +89,16 @@ class SearchEngineFragmentTest {
             } returns mockk(relaxed = true) {
                 every { context } returns testContext
             }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_show_sponsored_suggestions))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
+            every {
+                fragment.findPreference<SwitchPreference>(testContext.getString(R.string.pref_key_show_nonsponsored_suggestions))
+            } returns mockk(relaxed = true) {
+                every { context } returns testContext
+            }
             // This preference is the sole purpose of this test
             every {
                 fragment.findPreference<SwitchPreference>(voiceSearchPreferenceKey)
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt b/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
index 012bc5be8..d2804b067 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.shopping
 import mozilla.components.browser.engine.gecko.shopping.GeckoProductAnalysis
 import mozilla.components.browser.engine.gecko.shopping.Highlight
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 import java.util.SortedMap
 
 object ProductAnalysisTestData {
@@ -38,7 +39,7 @@ object ProductAnalysisTestData {
         productUrl: String = "https://test.com",
         reviewGrade: ReviewQualityCheckState.Grade? = ReviewQualityCheckState.Grade.A,
         adjustedRating: Float? = 4.5f,
-        needsAnalysis: Boolean = false,
+        analysisStatus: AnalysisStatus = AnalysisStatus.UP_TO_DATE,
         highlights: SortedMap<ReviewQualityCheckState.HighlightType, List<String>>? = null,
     ): ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent =
         ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent(
@@ -46,7 +47,7 @@ object ProductAnalysisTestData {
             productUrl = productUrl,
             reviewGrade = reviewGrade,
             adjustedRating = adjustedRating,
-            needsAnalysis = needsAnalysis,
+            analysisStatus = analysisStatus,
             highlights = highlights,
         )
 }
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeNetworkChecker.kt b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeNetworkChecker.kt
new file mode 100644
index 000000000..2e3750b77
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeNetworkChecker.kt
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.fake
+
+import org.mozilla.fenix.shopping.middleware.NetworkChecker
+
+class FakeNetworkChecker(
+    private val isConnected: Boolean,
+) : NetworkChecker {
+    override fun isConnected(): Boolean = isConnected
+}
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckPreferences.kt b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckPreferences.kt
new file mode 100644
index 000000000..9e2a22f87
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckPreferences.kt
@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.fake
+
+import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckPreferences
+
+class FakeReviewQualityCheckPreferences(
+    private val isEnabled: Boolean = false,
+    private val isProductRecommendationsEnabled: Boolean? = false,
+    private val updateCFRCallback: () -> Unit = { },
+) : ReviewQualityCheckPreferences {
+    override suspend fun enabled(): Boolean = isEnabled
+
+    override suspend fun productRecommendationsEnabled(): Boolean? = isProductRecommendationsEnabled
+
+    override suspend fun setEnabled(isEnabled: Boolean) {
+    }
+
+    override suspend fun setProductRecommendationsEnabled(isEnabled: Boolean) {
+    }
+
+    override suspend fun updateCFRCondition(time: Long) {
+        updateCFRCallback()
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckService.kt b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckService.kt
new file mode 100644
index 000000000..69359944a
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/shopping/fake/FakeReviewQualityCheckService.kt
@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.fake
+
+import mozilla.components.concept.engine.shopping.ProductAnalysis
+import org.mozilla.fenix.shopping.middleware.AnalysisStatusDto
+import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckService
+
+class FakeReviewQualityCheckService(
+    private val productAnalysis: (Int) -> ProductAnalysis? = { null },
+    private val reanalysis: AnalysisStatusDto? = null,
+    private val status: AnalysisStatusDto? = null,
+) : ReviewQualityCheckService {
+
+    private var analysisCount = 0
+
+    override suspend fun fetchProductReview(): ProductAnalysis? {
+        return productAnalysis(analysisCount).also {
+            analysisCount++
+        }
+    }
+
+    override suspend fun reanalyzeProduct(): AnalysisStatusDto? = reanalysis
+
+    override suspend fun analysisStatus(): AnalysisStatusDto? = status
+}
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckServiceImplTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/DefaultReviewQualityCheckServiceTest.kt
similarity index 92%
rename from app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckServiceImplTest.kt
rename to app/src/test/java/org/mozilla/fenix/shopping/middleware/DefaultReviewQualityCheckServiceTest.kt
index ee4074f89..cfb72a909 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckServiceImplTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/DefaultReviewQualityCheckServiceTest.kt
@@ -19,7 +19,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mockito.doAnswer
 
-class ReviewQualityCheckServiceImplTest {
+class DefaultReviewQualityCheckServiceTest {
 
     @get:Rule
     val coroutinesTestRule = MainCoroutineRule()
@@ -45,7 +45,7 @@ class ReviewQualityCheckServiceImplTest {
                 selectedTabId = tab.id,
             )
 
-            val tested = ReviewQualityCheckServiceImpl(BrowserStore(browserState))
+            val tested = DefaultReviewQualityCheckService(BrowserStore(browserState))
 
             val actual = tested.fetchProductReview()
 
@@ -72,7 +72,7 @@ class ReviewQualityCheckServiceImplTest {
                 selectedTabId = tab.id,
             )
 
-            val tested = ReviewQualityCheckServiceImpl(BrowserStore(browserState))
+            val tested = DefaultReviewQualityCheckService(BrowserStore(browserState))
 
             assertNull(tested.fetchProductReview())
         }
@@ -101,7 +101,7 @@ class ReviewQualityCheckServiceImplTest {
             selectedTabId = tab2.id,
         )
 
-        val tested = ReviewQualityCheckServiceImpl(BrowserStore(browserState))
+        val tested = DefaultReviewQualityCheckService(BrowserStore(browserState))
 
         val actual = tested.fetchProductReview()
 
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
index 5fcae3634..da83a0259 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
@@ -11,6 +11,7 @@ import org.junit.Test
 import org.mozilla.fenix.shopping.ProductAnalysisTestData
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
 import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.HighlightType
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 class ProductAnalysisMapperTest {
 
@@ -34,15 +35,15 @@ class ProductAnalysisMapperTest {
         val expected = ProductAnalysisTestData.analysisPresent(
             productId = "id1",
             reviewGrade = ReviewQualityCheckState.Grade.C,
-            needsAnalysis = false,
+            analysisStatus = AnalysisStatus.UP_TO_DATE,
             adjustedRating = 3.4f,
             productUrl = "https://example.com",
             highlights = sortedMapOf(
-                HighlightType.QUALITY to listOf("quality"),
-                HighlightType.PRICE to listOf("price"),
-                HighlightType.SHIPPING to listOf("shipping"),
-                HighlightType.PACKAGING_AND_APPEARANCE to listOf("appearance"),
-                HighlightType.COMPETITIVENESS to listOf("competitiveness"),
+                HighlightType.QUALITY to listOf("\"quality\""),
+                HighlightType.PRICE to listOf("\"price\""),
+                HighlightType.SHIPPING to listOf("\"shipping\""),
+                HighlightType.PACKAGING_AND_APPEARANCE to listOf("\"appearance\""),
+                HighlightType.COMPETITIVENESS to listOf("\"competitiveness\""),
             ),
         )
 
@@ -54,7 +55,7 @@ class ProductAnalysisMapperTest {
         val actual = ProductAnalysisTestData.productAnalysis(
             productId = "id1",
             grade = "C",
-            needsAnalysis = false,
+            needsAnalysis = true,
             adjustedRating = 3.4,
             analysisURL = "https://example.com",
             highlights = Highlight(
@@ -69,13 +70,13 @@ class ProductAnalysisMapperTest {
         val expected = ProductAnalysisTestData.analysisPresent(
             productId = "id1",
             reviewGrade = ReviewQualityCheckState.Grade.C,
-            needsAnalysis = false,
+            analysisStatus = AnalysisStatus.NEEDS_ANALYSIS,
             adjustedRating = 3.4f,
             productUrl = "https://example.com",
             highlights = sortedMapOf(
-                HighlightType.QUALITY to listOf("quality"),
-                HighlightType.PACKAGING_AND_APPEARANCE to listOf("appearance"),
-                HighlightType.COMPETITIVENESS to listOf("competitiveness"),
+                HighlightType.QUALITY to listOf("\"quality\""),
+                HighlightType.PACKAGING_AND_APPEARANCE to listOf("\"appearance\""),
+                HighlightType.COMPETITIVENESS to listOf("\"competitiveness\""),
             ),
         )
 
@@ -95,7 +96,7 @@ class ProductAnalysisMapperTest {
         val expected = ProductAnalysisTestData.analysisPresent(
             productId = "id1",
             reviewGrade = null,
-            needsAnalysis = false,
+            analysisStatus = AnalysisStatus.UP_TO_DATE,
             adjustedRating = 3.4f,
             productUrl = "https://example.com",
         )
@@ -106,16 +107,31 @@ class ProductAnalysisMapperTest {
     @Test
     fun `WHEN product analysis is null THEN it is mapped to Error`() {
         val actual = null.toProductReviewState()
-        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error
+        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.GenericError
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `WHEN product id is null and needs analysis is true THEN it is mapped to no analysis present`() {
+        val actual =
+            ProductAnalysisTestData.productAnalysis(
+                productId = null,
+                needsAnalysis = true,
+            ).toProductReviewState()
+        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent()
 
         assertEquals(expected, actual)
     }
 
     @Test
-    fun `WHEN product id is null THEN it is mapped to Error`() {
+    fun `WHEN product id is null and needs analysis is false THEN it is mapped to no generic error`() {
         val actual =
-            ProductAnalysisTestData.productAnalysis(productId = null).toProductReviewState()
-        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error
+            ProductAnalysisTestData.productAnalysis(
+                productId = null,
+                needsAnalysis = false,
+            ).toProductReviewState()
+        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.GenericError
 
         assertEquals(expected, actual)
     }
@@ -128,7 +144,7 @@ class ProductAnalysisMapperTest {
                 adjustedRating = 0.0,
                 highlights = null,
             ).toProductReviewState()
-        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent
+        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent()
 
         assertEquals(expected, actual)
     }
@@ -140,7 +156,7 @@ class ProductAnalysisMapperTest {
         }
 
         val actual = randomAnalysis.toProductReviewState()
-        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error
+        val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.GenericError
 
         assertEquals(expected, actual)
     }
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/RetryKtTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/RetryKtTest.kt
new file mode 100644
index 000000000..53fe58026
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/RetryKtTest.kt
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.shopping.middleware
+
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class RetryKtTest {
+
+    @Test
+    fun `WHEN predicate is false THEN return data on first attempt`() = runTest {
+        var count = 0
+
+        val actual = retry(predicate = { false }) {
+            count += 1
+            count
+        }
+        val expected = 1
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `WHEN predicate is true THEN retry max times`() = runTest {
+        var count = 0
+
+        val actual = retry(
+            maxRetries = 10,
+            predicate = { true },
+        ) {
+            count += 1
+            count
+        }
+
+        val expected = 10
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `WHEN predicate changes to false from true THEN return data on that attempt`() = runTest {
+        var count = 0
+
+        val actual = retry(
+            maxRetries = 10,
+            predicate = { it < 5 },
+        ) {
+            count += 1
+            count
+        }
+
+        val expected = 5
+
+        assertEquals(expected, actual)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddlewareTest.kt
new file mode 100644
index 000000000..d60497a0f
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ReviewQualityCheckNavigationMiddlewareTest.kt
@@ -0,0 +1,75 @@
+package org.mozilla.fenix.shopping.middleware
+
+import mozilla.components.support.test.ext.joinBlocking
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import mozilla.components.support.test.rule.MainCoroutineRule
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckAction
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckStore
+
+class ReviewQualityCheckNavigationMiddlewareTest {
+
+    @get:Rule
+    val coroutinesTestRule = MainCoroutineRule()
+    private val dispatcher = coroutinesTestRule.testDispatcher
+    private val scope = coroutinesTestRule.scope
+
+    @Test
+    fun `WHEN opening an external link THEN the link should be opened in a new tab`() {
+        var isOpenedInSelectedTab = false
+        var isOpenedInNewTab = false
+        val store = ReviewQualityCheckStore(
+            middleware = listOf(
+                ReviewQualityCheckNavigationMiddleware(
+                    openLink = { _, openInNewTab ->
+                        if (openInNewTab) {
+                            isOpenedInNewTab = true
+                        } else {
+                            isOpenedInSelectedTab = true
+                        }
+                    },
+                    scope = scope,
+                ),
+            ),
+        )
+        store.waitUntilIdle()
+        dispatcher.scheduler.advanceUntilIdle()
+
+        store.dispatch(ReviewQualityCheckAction.OpenLink(ReviewQualityCheckState.LinkType.ExternalLink("www.mozilla.com"))).joinBlocking()
+        store.waitUntilIdle()
+
+        assertEquals(true, isOpenedInNewTab)
+        assertEquals(false, isOpenedInSelectedTab)
+    }
+
+    @Test
+    fun `WHEN re-analzying a product THEN the link should be opened in the currently selected tab`() {
+        var isOpenedInSelectedTab = false
+        var isOpenedInNewTab = false
+        val store = ReviewQualityCheckStore(
+            middleware = listOf(
+                ReviewQualityCheckNavigationMiddleware(
+                    openLink = { _, openInNewTab ->
+                        if (openInNewTab) {
+                            isOpenedInNewTab = true
+                        } else {
+                            isOpenedInSelectedTab = true
+                        }
+                    },
+                    scope = scope,
+                ),
+            ),
+        )
+        store.waitUntilIdle()
+        dispatcher.scheduler.advanceUntilIdle()
+
+        store.dispatch(ReviewQualityCheckAction.OpenLink(ReviewQualityCheckState.LinkType.AnalyzeLink("www.mozilla.com"))).joinBlocking()
+        store.waitUntilIdle()
+
+        assertEquals(true, isOpenedInSelectedTab)
+        assertEquals(false, isOpenedInNewTab)
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt
index 6bea18941..d6d7aff47 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStateTest.kt
@@ -5,9 +5,12 @@
 package org.mozilla.fenix.shopping.store
 
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertThrows
+import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent
+import org.mozilla.fenix.shopping.ProductAnalysisTestData
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 class ReviewQualityCheckStateTest {
 
@@ -71,12 +74,9 @@ class ReviewQualityCheckStateTest {
     @Test
     fun `WHEN AnalysisPresent is created with grade, rating and highlights as null THEN exception is thrown`() {
         assertThrows(IllegalArgumentException::class.java) {
-            AnalysisPresent(
-                productId = "",
+            ProductAnalysisTestData.analysisPresent(
                 reviewGrade = null,
-                needsAnalysis = false,
                 adjustedRating = null,
-                productUrl = "",
                 highlights = null,
             )
         }
@@ -85,34 +85,25 @@ class ReviewQualityCheckStateTest {
     @Test
     fun `WHEN AnalysisPresent is created with at least one of grade, rating and highlights as not null THEN no exception is thrown`() {
         val ratingPresent = kotlin.runCatching {
-            AnalysisPresent(
-                productId = "1",
+            ProductAnalysisTestData.analysisPresent(
                 reviewGrade = null,
-                needsAnalysis = false,
                 adjustedRating = 1.2f,
-                productUrl = "",
                 highlights = null,
             )
         }
 
         val gradePresent = kotlin.runCatching {
-            AnalysisPresent(
-                productId = "2",
+            ProductAnalysisTestData.analysisPresent(
                 reviewGrade = ReviewQualityCheckState.Grade.A,
-                needsAnalysis = false,
                 adjustedRating = null,
-                productUrl = "",
                 highlights = null,
             )
         }
 
         val highlightsPresent = kotlin.runCatching {
-            AnalysisPresent(
-                productId = "2",
+            ProductAnalysisTestData.analysisPresent(
                 reviewGrade = null,
-                needsAnalysis = false,
                 adjustedRating = null,
-                productUrl = "",
                 highlights = sortedMapOf(
                     ReviewQualityCheckState.HighlightType.QUALITY to listOf(""),
                 ),
@@ -123,4 +114,159 @@ class ReviewQualityCheckStateTest {
         assert(gradePresent.isSuccess)
         assert(highlightsPresent.isSuccess)
     }
+
+    @Test
+    fun `WHEN AnalysisPresent has more than 2 highlights snippets THEN show more button and highlights fade are visible`() {
+        val highlights = sortedMapOf(
+            ReviewQualityCheckState.HighlightType.QUALITY to listOf(
+                "High quality",
+                "Excellent craftsmanship",
+                "Superior materials",
+            ),
+            ReviewQualityCheckState.HighlightType.PRICE to listOf(
+                "Affordable prices",
+                "Great value for money",
+                "Discounted offers",
+            ),
+            ReviewQualityCheckState.HighlightType.SHIPPING to listOf(
+                "Fast and reliable shipping",
+                "Free shipping options",
+                "Express delivery",
+            ),
+            ReviewQualityCheckState.HighlightType.PACKAGING_AND_APPEARANCE to listOf(
+                "Elegant packaging",
+                "Attractive appearance",
+                "Beautiful design",
+            ),
+            ReviewQualityCheckState.HighlightType.COMPETITIVENESS to listOf(
+                "Competitive pricing",
+                "Strong market presence",
+                "Unbeatable deals",
+            ),
+        )
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            highlights = highlights,
+        )
+
+        assertTrue(analysis.highlightsFadeVisible)
+        assertTrue(analysis.showMoreButtonVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent has exactly 1 highlights snippet THEN show more button and highlights fade are not visible`() {
+        val highlights = sortedMapOf(
+            ReviewQualityCheckState.HighlightType.PRICE to listOf("Affordable prices"),
+        )
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            highlights = highlights,
+        )
+
+        assertFalse(analysis.highlightsFadeVisible)
+        assertFalse(analysis.showMoreButtonVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent has exactly 2 highlights snippets THEN show more button and highlights fade are not visible`() {
+        val highlights = sortedMapOf(
+            ReviewQualityCheckState.HighlightType.SHIPPING to listOf(
+                "Fast and reliable shipping",
+                "Free shipping options",
+            ),
+        )
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            highlights = highlights,
+        )
+
+        assertFalse(analysis.highlightsFadeVisible)
+        assertFalse(analysis.showMoreButtonVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent has a single highlights section and the section has more than 2 snippets THEN show more button and highlights fade are visible`() {
+        val highlights = sortedMapOf(
+            ReviewQualityCheckState.HighlightType.SHIPPING to listOf(
+                "Fast and reliable shipping",
+                "Free shipping options",
+                "Express delivery",
+            ),
+        )
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            highlights = highlights,
+        )
+
+        assertTrue(analysis.highlightsFadeVisible)
+        assertTrue(analysis.showMoreButtonVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent has only 1 highlight snippet for the first category and more for others THEN show more button is visible and highlights fade is not visible`() {
+        val highlights = sortedMapOf(
+            ReviewQualityCheckState.HighlightType.QUALITY to listOf(
+                "High quality",
+            ),
+            ReviewQualityCheckState.HighlightType.PACKAGING_AND_APPEARANCE to listOf(
+                "Elegant packaging",
+                "Attractive appearance",
+                "Beautiful design",
+            ),
+            ReviewQualityCheckState.HighlightType.COMPETITIVENESS to listOf(
+                "Competitive pricing",
+                "Strong market presence",
+                "Unbeatable deals",
+            ),
+        )
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            highlights = highlights,
+        )
+
+        assertTrue(analysis.showMoreButtonVisible)
+        assertFalse(analysis.highlightsFadeVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent is created with grade or rating as null THEN not enough reviews card is visible`() {
+        val analysisWithoutGrade = ProductAnalysisTestData.analysisPresent(
+            reviewGrade = null,
+            adjustedRating = 3.2f,
+            analysisStatus = AnalysisStatus.UP_TO_DATE,
+        )
+
+        val analysisWithoutRatings = ProductAnalysisTestData.analysisPresent(
+            reviewGrade = ReviewQualityCheckState.Grade.A,
+            adjustedRating = null,
+            analysisStatus = AnalysisStatus.UP_TO_DATE,
+        )
+
+        assertTrue(analysisWithoutGrade.notEnoughReviewsCardVisible)
+        assertTrue(analysisWithoutRatings.notEnoughReviewsCardVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent is created with grade or rating as null and analysis status is needs analysis or reanalyzing THEN not enough reviews card is not visible`() {
+        val analysisWithoutGrade = ProductAnalysisTestData.analysisPresent(
+            reviewGrade = null,
+            adjustedRating = 3.2f,
+            analysisStatus = AnalysisStatus.NEEDS_ANALYSIS,
+        )
+
+        val analysisWithoutRatings = ProductAnalysisTestData.analysisPresent(
+            reviewGrade = ReviewQualityCheckState.Grade.A,
+            adjustedRating = null,
+            analysisStatus = AnalysisStatus.REANALYZING,
+        )
+
+        assertFalse(analysisWithoutGrade.notEnoughReviewsCardVisible)
+        assertFalse(analysisWithoutRatings.notEnoughReviewsCardVisible)
+    }
+
+    @Test
+    fun `WHEN AnalysisPresent is created with both grade and rating THEN not enough reviews card is not visible`() {
+        val analysis = ProductAnalysisTestData.analysisPresent(
+            reviewGrade = ReviewQualityCheckState.Grade.A,
+            adjustedRating = 3.2f,
+            analysisStatus = AnalysisStatus.UP_TO_DATE,
+        )
+
+        assertFalse(analysis.notEnoughReviewsCardVisible)
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt
index 6ca08083a..91637dd21 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/store/ReviewQualityCheckStoreTest.kt
@@ -8,16 +8,20 @@ import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
 import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.libstate.ext.waitUntilIdle
-import mozilla.components.support.test.mock
 import mozilla.components.support.test.rule.MainCoroutineRule
-import mozilla.components.support.test.whenever
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.shopping.ProductAnalysisTestData
+import org.mozilla.fenix.shopping.fake.FakeNetworkChecker
+import org.mozilla.fenix.shopping.fake.FakeReviewQualityCheckPreferences
+import org.mozilla.fenix.shopping.fake.FakeReviewQualityCheckService
+import org.mozilla.fenix.shopping.middleware.AnalysisStatusDto
+import org.mozilla.fenix.shopping.middleware.NetworkChecker
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckNetworkMiddleware
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckPreferences
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckPreferencesMiddleware
 import org.mozilla.fenix.shopping.middleware.ReviewQualityCheckService
+import org.mozilla.fenix.shopping.store.ReviewQualityCheckState.OptedIn.ProductReviewState.AnalysisPresent.AnalysisStatus
 
 class ReviewQualityCheckStoreTest {
 
@@ -48,11 +52,13 @@ class ReviewQualityCheckStoreTest {
     @Test
     fun `GIVEN the user has not opted in the feature WHEN the user opts in THEN state should display opted in UI`() =
         runTest {
+            var cfrConditionUpdated = false
             val tested = ReviewQualityCheckStore(
                 middleware = provideReviewQualityCheckMiddleware(
                     reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(
                         isEnabled = false,
                         isProductRecommendationsEnabled = false,
+                        updateCFRCallback = { cfrConditionUpdated = true },
                     ),
                 ),
             )
@@ -64,6 +70,7 @@ class ReviewQualityCheckStoreTest {
 
             val expected = ReviewQualityCheckState.OptedIn(productRecommendationsPreference = false)
             assertEquals(expected, tested.state)
+            assertEquals(true, cfrConditionUpdated)
         }
 
     @Test
@@ -87,6 +94,30 @@ class ReviewQualityCheckStoreTest {
             assertEquals(expected, tested.state)
         }
 
+    @Test
+    fun `GIVEN the user has opted in the feature and product recommendations feature is disabled THEN state should reflect that`() =
+        runTest {
+            val tested = ReviewQualityCheckStore(
+                middleware = provideReviewQualityCheckMiddleware(
+                    reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(
+                        isEnabled = true,
+                        isProductRecommendationsEnabled = null,
+                    ),
+                ),
+            )
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+            tested.waitUntilIdle()
+
+            val expected = ReviewQualityCheckState.OptedIn(productRecommendationsPreference = null)
+            assertEquals(expected, tested.state)
+
+            // Even if toggle action is dispatched, state is not changed
+            tested.dispatch(ReviewQualityCheckAction.ToggleProductRecommendation).joinBlocking()
+            tested.waitUntilIdle()
+            assertEquals(expected, tested.state)
+        }
+
     @Test
     fun `GIVEN the user has opted in the feature and product recommendations are off WHEN the user turns on product recommendations THEN state should reflect that`() =
         runTest {
@@ -130,16 +161,15 @@ class ReviewQualityCheckStoreTest {
         }
 
     @Test
-    fun `GIVEN the user has opted in the feature WHEN the a product analysis is fetched successfully THEN state should reflect that`() =
+    fun `GIVEN the user has opted in the feature WHEN a product analysis is fetched successfully THEN state should reflect that`() =
         runTest {
-            val reviewQualityCheckService = mock<ReviewQualityCheckService>()
-            whenever(reviewQualityCheckService.fetchProductReview())
-                .thenReturn(ProductAnalysisTestData.productAnalysis())
-
             val tested = ReviewQualityCheckStore(
                 middleware = provideReviewQualityCheckMiddleware(
                     reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
-                    reviewQualityCheckService = reviewQualityCheckService,
+                    reviewQualityCheckService = FakeReviewQualityCheckService(
+                        productAnalysis = { ProductAnalysisTestData.productAnalysis() },
+                    ),
+                    networkChecker = FakeNetworkChecker(isConnected = true),
                 ),
             )
             tested.waitUntilIdle()
@@ -157,15 +187,99 @@ class ReviewQualityCheckStoreTest {
         }
 
     @Test
-    fun `GIVEN the user has opted in the feature WHEN the a product analysis fetch fails THEN state should reflect that`() =
+    fun `GIVEN the user has opted in the feature WHEN a product analysis returns an error THEN state should reflect that`() =
         runTest {
-            val reviewQualityCheckService = mock<ReviewQualityCheckService>()
-            whenever(reviewQualityCheckService.fetchProductReview()).thenReturn(null)
+            val tested = ReviewQualityCheckStore(
+                middleware = provideReviewQualityCheckMiddleware(
+                    reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
+                    reviewQualityCheckService = FakeReviewQualityCheckService(),
+                    networkChecker = FakeNetworkChecker(isConnected = true),
+                ),
+            )
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+            tested.waitUntilIdle()
+            tested.dispatch(ReviewQualityCheckAction.FetchProductAnalysis).joinBlocking()
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
 
+            val expected = ReviewQualityCheckState.OptedIn(
+                productReviewState = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.GenericError,
+                productRecommendationsPreference = false,
+            )
+            assertEquals(expected, tested.state)
+        }
+
+    @Test
+    fun `GIVEN the user has opted in the feature WHEN device is not connected to the internet THEN state should reflect that`() =
+        runTest {
             val tested = ReviewQualityCheckStore(
                 middleware = provideReviewQualityCheckMiddleware(
                     reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
-                    reviewQualityCheckService = reviewQualityCheckService,
+                    reviewQualityCheckService = FakeReviewQualityCheckService(),
+                    networkChecker = FakeNetworkChecker(isConnected = false),
+                ),
+            )
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+            tested.waitUntilIdle()
+            tested.dispatch(ReviewQualityCheckAction.FetchProductAnalysis).joinBlocking()
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+
+            val expected = ReviewQualityCheckState.OptedIn(
+                productReviewState = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.NetworkError,
+                productRecommendationsPreference = false,
+            )
+            assertEquals(expected, tested.state)
+        }
+
+    @Test
+    fun `WHEN reanalysis api call fails THEN state should reflect that`() =
+        runTest {
+            val tested = ReviewQualityCheckStore(
+                middleware = provideReviewQualityCheckMiddleware(
+                    reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
+                    reviewQualityCheckService = FakeReviewQualityCheckService(
+                        reanalysis = null,
+                    ),
+                    networkChecker = FakeNetworkChecker(isConnected = true),
+                ),
+            )
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+            tested.waitUntilIdle()
+            tested.dispatch(ReviewQualityCheckAction.ReanalyzeProduct).joinBlocking()
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+
+            val expected = ReviewQualityCheckState.OptedIn(
+                productReviewState = ReviewQualityCheckState.OptedIn.ProductReviewState.Error.GenericError,
+                productRecommendationsPreference = false,
+            )
+            assertEquals(expected, tested.state)
+        }
+
+    @Test
+    fun `GIVEN a product analysis WHEN reanalysis call succeeds and status fails THEN state should reflect that`() =
+        runTest {
+            val productAnalysisList = listOf(
+                ProductAnalysisTestData.productAnalysis(
+                    needsAnalysis = true,
+                    grade = "B",
+                ),
+                ProductAnalysisTestData.productAnalysis(),
+            )
+
+            val tested = ReviewQualityCheckStore(
+                middleware = provideReviewQualityCheckMiddleware(
+                    reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
+                    reviewQualityCheckService = FakeReviewQualityCheckService(
+                        reanalysis = AnalysisStatusDto.PENDING,
+                        status = null,
+                        productAnalysis = { productAnalysisList[it] },
+                    ),
+                    networkChecker = FakeNetworkChecker(isConnected = true),
                 ),
             )
             tested.waitUntilIdle()
@@ -174,9 +288,43 @@ class ReviewQualityCheckStoreTest {
             tested.dispatch(ReviewQualityCheckAction.FetchProductAnalysis).joinBlocking()
             tested.waitUntilIdle()
             dispatcher.scheduler.advanceUntilIdle()
+            tested.dispatch(ReviewQualityCheckAction.ReanalyzeProduct).joinBlocking()
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
 
             val expected = ReviewQualityCheckState.OptedIn(
-                productReviewState = ReviewQualityCheckState.OptedIn.ProductReviewState.Error,
+                productReviewState = ProductAnalysisTestData.analysisPresent(
+                    reviewGrade = ReviewQualityCheckState.Grade.B,
+                    analysisStatus = AnalysisStatus.NEEDS_ANALYSIS,
+                ),
+                productRecommendationsPreference = false,
+            )
+            assertEquals(expected, tested.state)
+        }
+
+    @Test
+    fun `WHEN reanalysis and status api call succeeds THEN analysis should be fetched and displayed`() =
+        runTest {
+            val tested = ReviewQualityCheckStore(
+                middleware = provideReviewQualityCheckMiddleware(
+                    reviewQualityCheckPreferences = FakeReviewQualityCheckPreferences(isEnabled = true),
+                    reviewQualityCheckService = FakeReviewQualityCheckService(
+                        productAnalysis = { ProductAnalysisTestData.productAnalysis() },
+                        reanalysis = AnalysisStatusDto.PENDING,
+                        status = AnalysisStatusDto.COMPLETED,
+                    ),
+                    networkChecker = FakeNetworkChecker(isConnected = true),
+                ),
+            )
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+            tested.waitUntilIdle()
+            tested.dispatch(ReviewQualityCheckAction.ReanalyzeProduct).joinBlocking()
+            tested.waitUntilIdle()
+            dispatcher.scheduler.advanceUntilIdle()
+
+            val expected = ReviewQualityCheckState.OptedIn(
+                productReviewState = ProductAnalysisTestData.analysisPresent(),
                 productRecommendationsPreference = false,
             )
             assertEquals(expected, tested.state)
@@ -185,8 +333,9 @@ class ReviewQualityCheckStoreTest {
     private fun provideReviewQualityCheckMiddleware(
         reviewQualityCheckPreferences: ReviewQualityCheckPreferences,
         reviewQualityCheckService: ReviewQualityCheckService? = null,
+        networkChecker: NetworkChecker? = null,
     ): List<ReviewQualityCheckMiddleware> {
-        return if (reviewQualityCheckService != null) {
+        return if (reviewQualityCheckService != null && networkChecker != null) {
             listOf(
                 ReviewQualityCheckPreferencesMiddleware(
                     reviewQualityCheckPreferences = reviewQualityCheckPreferences,
@@ -194,6 +343,7 @@ class ReviewQualityCheckStoreTest {
                 ),
                 ReviewQualityCheckNetworkMiddleware(
                     reviewQualityCheckService = reviewQualityCheckService,
+                    networkChecker = networkChecker,
                     scope = this.scope,
                 ),
             )
@@ -207,18 +357,3 @@ class ReviewQualityCheckStoreTest {
         }
     }
 }
-
-private class FakeReviewQualityCheckPreferences(
-    private val isEnabled: Boolean = false,
-    private val isProductRecommendationsEnabled: Boolean = false,
-) : ReviewQualityCheckPreferences {
-    override suspend fun enabled(): Boolean = isEnabled
-
-    override suspend fun productRecommendationsEnabled(): Boolean = isProductRecommendationsEnabled
-
-    override suspend fun setEnabled(isEnabled: Boolean) {
-    }
-
-    override suspend fun setProductRecommendationsEnabled(isEnabled: Boolean) {
-    }
-}
diff --git a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
index a37e67ba1..f99f36893 100644
--- a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedDeviceTabsTest.kt
@@ -82,7 +82,7 @@ class SyncedDeviceTabsTest {
     @Test
     fun `GIVEN two synced devices WHEN the compose list is generated THEN two device section is returned`() {
         val syncedDeviceList = listOf(oneTabDevice, twoTabDevice)
-        val listData = syncedDeviceList.toComposeList(taskContinuityEnabled = true)
+        val listData = syncedDeviceList.toComposeList()
 
         assertEquals(2, listData.count())
         assertTrue(listData[0] is SyncedTabsListItem.DeviceSection)
@@ -94,7 +94,7 @@ class SyncedDeviceTabsTest {
     @Test
     fun `GIVEN one synced device with no tabs WHEN the compose list is generated THEN one device with an empty tabs list is returned`() {
         val syncedDeviceList = listOf(noTabDevice)
-        val listData = syncedDeviceList.toComposeList(taskContinuityEnabled = true)
+        val listData = syncedDeviceList.toComposeList()
 
         assertEquals(1, listData.count())
         assertTrue(listData[0] is SyncedTabsListItem.DeviceSection)
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
index 695bbf8d7..cbdfc01b9 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
@@ -48,6 +48,7 @@ class FloatingActionButtonBindingTest {
             tabsTrayStore,
             actionButton,
             interactor,
+            true,
         )
 
         fabBinding.start()
@@ -65,6 +66,7 @@ class FloatingActionButtonBindingTest {
             tabsTrayStore,
             actionButton,
             interactor,
+            true,
         )
 
         fabBinding.start()
@@ -82,6 +84,7 @@ class FloatingActionButtonBindingTest {
             tabsTrayStore,
             actionButton,
             interactor,
+            true,
         )
 
         fabBinding.start()
@@ -92,6 +95,24 @@ class FloatingActionButtonBindingTest {
         verify(exactly = 0) { actionButton.hide() }
     }
 
+    @Test
+    fun `GIVEN the selected tab page is sync WHEN the user is not signed in THEN extend and show is called`() {
+        val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.SyncedTabs))
+        val fabBinding = FloatingActionButtonBinding(
+            tabsTrayStore,
+            actionButton,
+            interactor,
+            false,
+        )
+
+        fabBinding.start()
+
+        verify(exactly = 0) { actionButton.extend() }
+        verify(exactly = 0) { actionButton.show() }
+        verify(exactly = 0) { actionButton.shrink() }
+        verify(exactly = 1) { actionButton.hide() }
+    }
+
     @Test
     fun `WHEN selected page is updated THEN button is updated`() {
         val tabsTrayStore = TabsTrayStore(TabsTrayState(selectedPage = Page.NormalTabs))
@@ -99,6 +120,7 @@ class FloatingActionButtonBindingTest {
             tabsTrayStore,
             actionButton,
             interactor,
+            true,
         )
 
         fabBinding.start()
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayStateTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayStateTest.kt
new file mode 100644
index 000000000..e146074b3
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayStateTest.kt
@@ -0,0 +1,206 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabstray
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import mozilla.components.support.test.libstate.ext.waitUntilIdle
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.MenuItem
+import org.mozilla.fenix.tabstray.ext.getMenuItems
+import org.mozilla.fenix.tabstray.ext.isSelect
+
+@RunWith(AndroidJUnit4::class)
+class TabsTrayStateTest {
+
+    private lateinit var store: TabsTrayStore
+
+    @Before
+    fun setup() {
+        store = TabsTrayStore()
+    }
+
+    @Test
+    fun `WHEN entering select mode THEN isSelected extension method returns true`() {
+        store.dispatch(TabsTrayAction.EnterSelectMode)
+        store.waitUntilIdle()
+
+        Assert.assertTrue(store.state.mode.isSelect())
+    }
+
+    @Test
+    fun `WHEN entering normal mode THEN isSelected extension method returns false`() {
+        store.dispatch(TabsTrayAction.ExitSelectMode)
+        store.waitUntilIdle()
+
+        Assert.assertFalse(store.state.mode.isSelect())
+    }
+
+    @Test
+    fun `GIVEN select mode is selected and show the inactive button is true WHEN entering any page THEN return 3 items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Select(emptySet()),
+            shouldShowInactiveButton = true,
+        )
+        Assert.assertEquals(menuItems.size, 3)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_multiselect_menu_item_bookmark),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_multiselect_menu_item_close),
+        )
+        Assert.assertEquals(
+            menuItems[2].title,
+            testContext.getString(R.string.inactive_tabs_menu_item),
+        )
+    }
+
+    @Test
+    fun `GIVEN select mode is selected and show the inactive button is false WHEN entering any page THEN return 2 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Select(emptySet()),
+        )
+        Assert.assertEquals(menuItems.size, 2)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_multiselect_menu_item_bookmark),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_multiselect_menu_item_close),
+        )
+    }
+
+    @Test
+    fun `GIVEN normal mode is selected and no normal tabs are opened WHEN entering normal page THEN return 2 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Normal,
+        )
+        Assert.assertEquals(menuItems.size, 2)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_menu_tab_settings),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_menu_recently_closed),
+        )
+    }
+
+    @Test
+    fun `GIVEN normal mode is selected and multiple normal tabs are opened WHEN entering normal page THEN return 5 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Normal,
+            normalTabCount = 3,
+        )
+        Assert.assertEquals(menuItems.size, 5)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tabs_tray_select_tabs),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_menu_item_share),
+        )
+        Assert.assertEquals(
+            menuItems[2].title,
+            testContext.getString(R.string.tab_tray_menu_tab_settings),
+        )
+        Assert.assertEquals(
+            menuItems[3].title,
+            testContext.getString(R.string.tab_tray_menu_recently_closed),
+        )
+        Assert.assertEquals(
+            menuItems[4].title,
+            testContext.getString(R.string.tab_tray_menu_item_close),
+        )
+    }
+
+    @Test
+    fun `GIVEN normal mode is selected and no private tabs are opened WHEN entering private page THEN return 2 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Normal,
+            selectedPage = Page.PrivateTabs,
+        )
+        Assert.assertEquals(menuItems.size, 2)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_menu_tab_settings),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_menu_recently_closed),
+        )
+    }
+
+    @Test
+    fun `GIVEN normal mode is selected and multiple private tabs are opened WHEN entering private page THEN return 3 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Normal,
+            selectedPage = Page.PrivateTabs,
+            privateTabCount = 6,
+        )
+        Assert.assertEquals(menuItems.size, 3)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_menu_tab_settings),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_menu_recently_closed),
+        )
+        Assert.assertEquals(
+            menuItems[2].title,
+            testContext.getString(R.string.tab_tray_menu_item_close),
+        )
+    }
+
+    @Test
+    fun `GIVEN normal mode is selected WHEN entering synced page THEN return 2 menu items`() {
+        val menuItems = initMenuItems(
+            mode = TabsTrayState.Mode.Normal,
+            selectedPage = Page.SyncedTabs,
+        )
+        Assert.assertEquals(menuItems.size, 2)
+        Assert.assertEquals(
+            menuItems[0].title,
+            testContext.getString(R.string.tab_tray_menu_account_settings),
+        )
+        Assert.assertEquals(
+            menuItems[1].title,
+            testContext.getString(R.string.tab_tray_menu_recently_closed),
+        )
+    }
+
+    private fun initMenuItems(
+        mode: TabsTrayState.Mode,
+        shouldShowInactiveButton: Boolean = false,
+        selectedPage: Page = Page.NormalTabs,
+        normalTabCount: Int = 0,
+        privateTabCount: Int = 0,
+    ): List<MenuItem> =
+        mode.getMenuItems(
+            resources = testContext.resources,
+            shouldShowInactiveButton = shouldShowInactiveButton,
+            selectedPage = selectedPage,
+            normalTabCount = normalTabCount,
+            privateTabCount = privateTabCount,
+            onBookmarkSelectedTabsClick = {},
+            onCloseSelectedTabsClick = {},
+            onMakeSelectedTabsInactive = {},
+            onTabSettingsClick = {},
+            onRecentlyClosedClick = {},
+            onEnterMultiselectModeClick = {},
+            onShareAllTabsClick = {},
+            onDeleteAllTabsClick = {},
+            onAccountSettingsClick = {},
+        )
+}
diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
index 35bd7daa5..f03aec22c 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -18,6 +18,7 @@ import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -827,22 +828,8 @@ class SettingsTest {
     }
 
     @Test
-    fun `GIVEN junoOnboarding is disabled THEN shouldShowJunoOnboarding returns false`() {
+    fun `GIVEN hasUserBeenOnboarded is false and isLauncherIntent is false THEN shouldShowJunoOnboarding returns false`() {
         val settings = spyk(settings)
-        every { settings.junoOnboardingEnabled } returns false
-
-        val actual = settings.shouldShowJunoOnboarding(
-            hasUserBeenOnboarded = false,
-            isLauncherIntent = true,
-        )
-
-        assertFalse(actual)
-    }
-
-    @Test
-    fun `GIVEN junoOnboarding is enabled, hasUserBeenOnboarded is false and isLauncherIntent is false THEN shouldShowJunoOnboarding returns false`() {
-        val settings = spyk(settings)
-        every { settings.junoOnboardingEnabled } returns true
 
         val actual = settings.shouldShowJunoOnboarding(
             hasUserBeenOnboarded = false,
@@ -853,9 +840,8 @@ class SettingsTest {
     }
 
     @Test
-    fun `GIVEN junoOnboarding is enabled and hasUserBeenOnboarded is true THEN shouldShowJunoOnboarding returns false`() {
+    fun `GIVEN hasUserBeenOnboarded is true THEN shouldShowJunoOnboarding returns false`() {
         val settings = spyk(settings)
-        every { settings.junoOnboardingEnabled } returns true
 
         val actual = settings.shouldShowJunoOnboarding(
             hasUserBeenOnboarded = true,
@@ -866,9 +852,8 @@ class SettingsTest {
     }
 
     @Test
-    fun `GIVEN junoOnboarding is enabled, hasUserBeenOnboarded is false and isLauncherIntent is true THEN shouldShowJunoOnboarding returns true`() {
+    fun `GIVEN hasUserBeenOnboarded is false and isLauncherIntent is true THEN shouldShowJunoOnboarding returns true`() {
         val settings = spyk(settings)
-        every { settings.junoOnboardingEnabled } returns true
 
         val actual = settings.shouldShowJunoOnboarding(
             hasUserBeenOnboarded = false,
@@ -966,4 +951,57 @@ class SettingsTest {
         settings.openLinksInExternalApp = "pref_key_open_links_in_apps_never"
         assertEquals(settings.getOpenLinksInAppsString(), "Never")
     }
+
+    @Test
+    fun `GIVEN a written integer value for pref_key_search_widget_installed WHEN reading searchWidgetInstalled THEN do not throw a ClassCastException`() {
+        val expectedInt = 5
+        val oldPrefKey = "pref_key_search_widget_installed"
+
+        settings.preferences.edit().putInt(oldPrefKey, expectedInt).apply()
+
+        try {
+            assertEquals(expectedInt, settings.preferences.getInt(oldPrefKey, 0))
+            assertFalse(settings.searchWidgetInstalled)
+        } catch (e: ClassCastException) {
+            fail("Unexpected ClassCastException")
+        }
+    }
+
+    @Test
+    fun `GIVEN previously stored pref_key_search_widget_installed value WHEN calling migrateSearchWidgetInstalledIfNeeded THEN migrate the value`() {
+        val expectedInt = 5
+        val oldPrefKey = "pref_key_search_widget_installed"
+
+        settings.preferences.edit().putInt(oldPrefKey, expectedInt).apply()
+
+        assertEquals(expectedInt, settings.preferences.getInt(oldPrefKey, 0))
+        assertFalse(settings.searchWidgetInstalled)
+
+        settings.migrateSearchWidgetInstalledPrefIfNeeded()
+
+        assertTrue(settings.searchWidgetInstalled)
+    }
+
+    @Test
+    fun `GIVEN none previously stored pref_key_search_widget_installed value WHEN calling migrateSearchWidgetInstalledIfNeeded THEN migration should not happen`() {
+        val oldPrefKey = "pref_key_search_widget_installed"
+        val expectedDefaultValue = 0
+        val storedValue = settings.preferences.getInt(oldPrefKey, expectedDefaultValue)
+
+        assertEquals(expectedDefaultValue, storedValue)
+
+        settings.migrateSearchWidgetInstalledPrefIfNeeded()
+
+        assertEquals(expectedDefaultValue, settings.preferences.getInt(oldPrefKey, expectedDefaultValue))
+        assertFalse(settings.searchWidgetInstalled)
+    }
+
+    @Test
+    fun `GIVEN previously stored pref_key_search_widget_installed value is Boolean WHEN calling migrateSearchWidgetInstalledIfNeeded THEN crash should not happen`() {
+        val oldPrefKey = "pref_key_search_widget_installed"
+        settings.preferences.edit().putBoolean(oldPrefKey, false).apply()
+
+        settings.migrateSearchWidgetInstalledPrefIfNeeded()
+        assertFalse(settings.searchWidgetInstalled)
+    }
 }
diff --git a/automation/taskcluster/androidTest/flank-arm-beta.yml b/automation/taskcluster/androidTest/flank-arm-beta.yml
index c97ea7476..6774ab503 100644
--- a/automation/taskcluster/androidTest/flank-arm-beta.yml
+++ b/automation/taskcluster/androidTest/flank-arm-beta.yml
@@ -20,9 +20,7 @@ gcloud:
   performance-metrics: true
 
   test-targets:
-    - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest
-    - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest
-    - class org.mozilla.fenix.ui.MainMenuTest#openMainMenuSettingsItemTest
+    - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
     - class org.mozilla.fenix.ui.SettingsSearchTest#toggleSearchSuggestionsTest
     - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
     - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
diff --git a/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml b/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml
index 067913661..6977ad7b9 100644
--- a/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml
+++ b/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml
@@ -23,15 +23,12 @@ gcloud:
     - notPackage org.mozilla.fenix.screenshots
     - notPackage org.mozilla.fenix.syncintegration
     - notPackage org.mozilla.fenix.experimentintegration
-    - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest
-    - class org.mozilla.fenix.ui.NavigationToolbarTest#goBackTest
-    - class org.mozilla.fenix.ui.NavigationToolbarTest#goForwardTest
-    - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest
-    - class org.mozilla.fenix.ui.MainMenuTest#openMainMenuSettingsItemTest
+    - class org.mozilla.fenix.ui.MainMenuTest#goBackTest
+    - class org.mozilla.fenix.ui.MainMenuTest#goForwardTest
+    - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
     - class org.mozilla.fenix.ui.SettingsSearchTest#toggleSearchSuggestionsTest
     - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
     - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
-    - class org.mozilla.fenix.ui.SmokeTest#verifyBasicNavigationToolbarFunctionality
     - class org.mozilla.fenix.ui.TabbedBrowsingTest#openNewTabTest
     - class org.mozilla.fenix.ui.TabbedBrowsingTest#openNewPrivateTabTest
     - class org.mozilla.fenix.ui.TopSitesTest#verifyOpenTopSiteNormalTab
diff --git a/automation/taskcluster/androidTest/flank-arm-start-test.yml b/automation/taskcluster/androidTest/flank-arm-start-test.yml
index 0eca09930..82e2006c6 100644
--- a/automation/taskcluster/androidTest/flank-arm-start-test.yml
+++ b/automation/taskcluster/androidTest/flank-arm-start-test.yml
@@ -20,9 +20,7 @@ gcloud:
   performance-metrics: true
 
   test-targets:
-   - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest
-   - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest
-   - class org.mozilla.fenix.ui.MainMenuTest#openMainMenuSettingsItemTest
+   - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
    - class org.mozilla.fenix.ui.SettingsSearchTest#toggleSearchSuggestionsTest
    - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
    - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index 509794ab6..e917c0bdd 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -46,7 +46,7 @@ android {
  * and that's applied to the app module. Since there are no other uses of the glean plugin in the
  * benchmark module, we do this manually here.
  */
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.capabilitiesResolution.withCapability("org.mozilla.telemetry:glean-native") {
         def toBeSelected = candidates.find { it.id instanceof ModuleComponentIdentifier && it.id.module.contains('geckoview') }
         if (toBeSelected != null) {
diff --git a/build.gradle b/build.gradle
index 4a0b37a79..7d21a7211 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,7 @@
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -84,6 +88,7 @@ buildscript {
     // intermediate variable which can pull from FenixDependenciesPlugin.kt and be used later.
     ext {
         detekt_plugin = Versions.detekt
+        ksp_plugin = Versions.ksp_plugin
         protobuf_plugin = FenixVersions.protobuf_plugin
         python_envs_plugin = Versions.python_envs_plugin
     }
@@ -91,6 +96,7 @@ buildscript {
 
 plugins {
     id("io.gitlab.arturbosch.detekt").version("$detekt_plugin")
+    id("com.google.devtools.ksp").version("$ksp_plugin")
 }
 
 allprojects {
@@ -160,11 +166,11 @@ allprojects {
         }
     }
 
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    tasks.withType(KotlinCompile).configureEach {
         kotlinOptions.jvmTarget = "17"
         kotlinOptions.allWarningsAsErrors = true
         kotlinOptions.freeCompilerArgs += [
-            "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"
+            "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all-compatibility"
         ]
     }
 }
@@ -191,7 +197,7 @@ detekt {
     }
 }
 
-tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach() {
+tasks.withType(Detekt).configureEach() {
     autoCorrect = true
 
     exclude "**/test/**"
@@ -202,7 +208,7 @@ tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach() {
 }
 
 // Apply same path exclusions as for the main task
-tasks.withType(io.gitlab.arturbosch.detekt.DetektCreateBaselineTask).configureEach() {
+tasks.withType(DetektCreateBaselineTask).configureEach() {
     exclude "**/test/**"
     exclude "**/androidTest/**"
     exclude "**/build/**"
@@ -229,11 +235,11 @@ tasks.register('ktlint', JavaExec) {
     group = "verification"
     description = "Check Kotlin code style."
     classpath = configurations.ktlint
-    main = "com.pinterest.ktlint.Main"
+    mainClass.set("com.pinterest.ktlint.Main")
     args "app/src/**/*.kt", "!**/build/**/*.kt", "--baseline=ktlint-baseline.xml"
 }
 
-task ktlintFormat(type: JavaExec, group: "formatting") {
+tasks.register('ktlintFormat', JavaExec) {
     description = "Fix Kotlin code style deviations."
     classpath = configurations.ktlint
     mainClass.set("com.pinterest.ktlint.Main")
@@ -241,7 +247,7 @@ task ktlintFormat(type: JavaExec, group: "formatting") {
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
-tasks.withType(io.gitlab.arturbosch.detekt.Detekt.class).configureEach {
+tasks.withType(Detekt.class).configureEach {
     exclude("**/resources/**")
     exclude("**/tmp/**")
 }
diff --git a/docs/architecture-overview.md b/docs/architecture-overview.md
index f0ef8f184..5a53f434a 100644
--- a/docs/architecture-overview.md
+++ b/docs/architecture-overview.md
@@ -16,7 +16,7 @@ A store of State.
 
 See [mozilla.components.lib.state.Store](https://github.com/mozilla-mobile/firefox-android/blob/main/android-components/components/lib/state/src/main/java/mozilla/components/lib/state/Store.kt)
 
-Holds app State. 
+Holds app State.
 
 Receives [Actions](#action), which are used to compute new State using [Reducers](#reducer) and can have [Middlewares](#middleware) attached which respond to and manipulate actions.
 
diff --git a/docs/substituting-local-gv.md b/docs/substituting-local-gv.md
index 868e7d716..27605c3ca 100644
--- a/docs/substituting-local-gv.md
+++ b/docs/substituting-local-gv.md
@@ -1,26 +1,8 @@
 # Substituting local GeckoView
 
 ### 1. Manually publish local GeckoView to local Maven
-First, to get the version that we are locally publishing (which will be used in later steps) please add the following:
 
-*geckoview/build.gradle*
-```diff
-diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
-index 731026796921b..81cc6782be291 100644
---- a/mobile/android/geckoview/build.gradle
-+++ b/mobile/android/geckoview/build.gradle
-@@ -398,6 +398,7 @@ android.libraryVariants.all { variant ->
- apply plugin: 'maven-publish'
- 
- version = getVersionNumber()
-+println("version = " + version)
- group = 'org.mozilla.geckoview'
- 
- def getArtifactId() {
-
-```
-
-We can now publish our local GeckoView to our local maven.
+Publish our local GeckoView to our local maven:
 ```sh
 ./mach build && ./mach gradle \
     geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal \
@@ -29,17 +11,17 @@ We can now publish our local GeckoView to our local maven.
 
 :warning: **This needs to be run every time you make changes.** :warning:
 
-You need to copy the version in the logs or run 
+You need to copy the version in the logs or run:
 ```sh
 ./mach build | grep version
-``` 
+```
 (ex. `115.0.20230511122045-SNAPSHOT`)
 
 ### 2. Modify Fenix to consume local GV
 Update the build.gradle and Gecko.kt file in Fenix (see the diffs below). Remember to update the GV version with the version you found in step 2!
 
 *fenix/build.gradle*
-```diff 
+```diff
 diff --git a/fenix/build.gradle b/fenix/build.gradle
 index 6a635a4818..4c8cc28995 100644
 --- a/fenix/build.gradle
@@ -73,7 +55,7 @@ index bed3fb0161..2d3a19a96e 100644
       */
 -    const val version = "115.0.20230511131014"
 +    const val version = "115.0.20230511122045-SNAPSHOT"
- 
+
      /**
       * GeckoView channel
 @@ -23,7 +23,7 @@ object Gecko {
@@ -89,6 +71,6 @@ index bed3fb0161..2d3a19a96e 100644
 ```
 
 ### 3. Build fenix with local GV
-Now sync your gradle changes and build! 
+Now sync your gradle changes and build!
 
 An easy way to confirm you are using a local GV is switching your Android Studio project tool window to "Project" and looking in the root directory called "External Libraries" for "GeckoView". You should see something like `Gradle: org.mozilla.geckoview-default-omni:115.0.20230511122045-SNAPSHOT@aar`
diff --git a/plugins/apksize/src/main/java/ApkSizePlugin.kt b/plugins/apksize/src/main/java/ApkSizePlugin.kt
index dd42b2650..a327cee09 100644
--- a/plugins/apksize/src/main/java/ApkSizePlugin.kt
+++ b/plugins/apksize/src/main/java/ApkSizePlugin.kt
@@ -107,7 +107,7 @@ open class ApkSizeTask : DefaultTask() {
             suite.put("value", getSummarySize(apkSize))
             suite.put("lowerIsBetter", true)
             suite.put("alertChangeType", "absolute")
-            suite.put("alertThreshold", 100 * 1024)
+            suite.put("alertThreshold", 1024 * 1024)
 
             val subtests = JSONArray()
             apkSize.forEach { (apk, size) ->
diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index f830a668e..9edb49cda 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -22,7 +22,6 @@ object FenixVersions {
     const val androidx_benchmark = "1.1.1"
     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"
@@ -54,7 +53,6 @@ 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}"
diff --git a/settings.gradle b/settings.gradle
index 803c47d45..64fc142e4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,10 +30,10 @@ gradle.projectsLoaded { ->
     // Disables A-C tests and lint when building Fenix.
     gradle.allprojects { project ->
         if (project.projectDir.absolutePath.contains("/android-components/")) {
-            project.tasks.withType(Test) {
+            project.tasks.withType(Test).configureEach {
                 enabled = false
             }
-            project.tasks.whenTaskAdded { task ->
+            project.tasks.configureEach { task ->
                 if (task.name.contains("lint")) {
                     task.enabled = false
                 }