From 39f78c88218b038e99bc590ce1d64d265c3d5d39 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 1 Apr 2024 21:47:30 +0000
Subject: [PATCH] =?utf8?q?Bug=201885561=20-=20[Menu=20Redesign]=20Rename?=
 =?utf8?q?=20=E2=80=9CAdd-ons=E2=80=9D=20to=20=E2=80=9CExtensions=E2=80=9D?=
 =?utf8?q?=20in=20menus=20and=20Add-ons=20Manager=20r=3Dandroid-reviewers,?=
 =?utf8?q?Roger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Differential Revision: https://phabricator.services.mozilla.com/D206094
---
 .../browser/menu/WebExtensionBrowserMenuBuilder.kt | 10 ++--
 .../browser/menu/src/main/res/values/strings.xml   | 14 +++--
 .../menu/WebExtensionBrowserMenuBuilderTest.kt     |  4 +-
 .../feature/addons/ui/AddonsManagerAdapter.kt      |  4 +-
 .../feature/addons/update/AddonUpdater.kt          |  2 +-
 .../mozac_feature_addons_footer_section_item.xml   |  4 +-
 .../mozac_feature_addons_header_section_item.xml   |  8 +--
 .../feature/addons/src/main/res/values/strings.xml | 64 ++++++++++++++++------
 .../feature/addons/ui/AddonsManagerAdapterTest.kt  |  2 +-
 .../samples/browser/addons/AddonsFragment.kt       |  2 +-
 .../addons/InstalledAddonDetailsActivity.kt        |  2 +-
 .../main/res/layout/overlay_add_on_progress.xml    |  2 +-
 .../fenix/screenshots/MenuScreenShotTest.kt        |  2 +-
 .../org/mozilla/fenix/ui/robots/SettingsRobot.kt   | 41 ++++++++------
 .../ui/robots/SettingsSubMenuAddonsManagerRobot.kt |  6 +-
 .../fenix/ui/robots/ThreeDotMenuMainRobot.kt       |  2 +-
 .../fenix/addons/AddonsManagementFragment.kt       |  4 +-
 ...xtensionsProcessDisabledForegroundController.kt |  4 +-
 .../fenix/addons/InstalledAddonDetailsFragment.kt  |  2 +-
 .../fenix/extension/WebExtensionPromptFeature.kt   |  8 +--
 .../main/java/org/mozilla/fenix/home/HomeMenu.kt   |  2 +-
 .../org/mozilla/fenix/settings/SettingsFragment.kt |  4 +-
 .../src/main/res/layout/crash_extension_dialog.xml |  6 +-
 .../main/res/layout/fragment_add_on_details.xml    |  2 +-
 .../res/layout/fragment_add_ons_management.xml     |  2 +-
 .../main/res/layout/overlay_add_on_progress.xml    |  2 +-
 .../fenix/app/src/main/res/values/strings.xml      | 54 +++++++++++++-----
 .../fenix/app/src/main/res/xml/preferences.xml     |  6 +-
 .../extension/WebExtensionPromptFeatureTest.kt     |  8 +--
 29 files changed, 170 insertions(+), 103 deletions(-)

diff --git a/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt b/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
index 1ca54f676467..494014bf66b5 100644
--- a/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
+++ b/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
@@ -91,14 +91,14 @@ class WebExtensionBrowserMenuBuilder(
     ): List<BrowserMenuItem> {
         val addonsMenuItem = if (filteredExtensionMenuItems.isNotEmpty()) {
             val backPressMenuItem = BackPressMenuItem(
-                contentDescription = context.getString(R.string.mozac_browser_menu_addons_description),
-                label = context.getString(R.string.mozac_browser_menu_addons),
+                contentDescription = context.getString(R.string.mozac_browser_menu_extensions_content_description),
+                label = context.getString(R.string.mozac_browser_menu_extensions),
                 imageResource = style.backPressMenuItemDrawableRes,
                 iconTintColorResource = style.webExtIconTintColorResource,
             )
 
             val addonsManagerMenuItem = BrowserMenuImageText(
-                label = context.getString(R.string.mozac_browser_menu_addons_manager),
+                label = context.getString(R.string.mozac_browser_menu_extensions_manager),
                 imageResource = style.addonsManagerMenuItemDrawableRes,
                 iconTintColorResource = style.webExtIconTintColorResource,
             ) {
@@ -119,7 +119,7 @@ class WebExtensionBrowserMenuBuilder(
             val webExtMenu = WebExtensionBrowserMenu(webExtBrowserMenuAdapter, store)
 
             ParentBrowserMenuItem(
-                label = context.getString(R.string.mozac_browser_menu_addons),
+                label = context.getString(R.string.mozac_browser_menu_extensions),
                 imageResource = style.addonsManagerMenuItemDrawableRes,
                 iconTintColorResource = style.webExtIconTintColorResource,
                 subMenu = webExtMenu,
@@ -127,7 +127,7 @@ class WebExtensionBrowserMenuBuilder(
             )
         } else {
             BrowserMenuImageText(
-                label = context.getString(R.string.mozac_browser_menu_addons),
+                label = context.getString(R.string.mozac_browser_menu_extensions),
                 imageResource = style.addonsManagerMenuItemDrawableRes,
                 iconTintColorResource = style.webExtIconTintColorResource,
             ) {
diff --git a/mobile/android/android-components/components/browser/menu/src/main/res/values/strings.xml b/mobile/android/android-components/components/browser/menu/src/main/res/values/strings.xml
index bb0b725b17cc..dae4c81308b1 100644
--- a/mobile/android/android-components/components/browser/menu/src/main/res/values/strings.xml
+++ b/mobile/android/android-components/components/browser/menu/src/main/res/values/strings.xml
@@ -2,17 +2,23 @@
 <!-- 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/. -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"  xmlns:moz="http://mozac.org/tools">
     <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
     <string name="mozac_browser_menu_button">Menu</string>
     <!-- Content description (not visible, for screen readers etc.): Indicates the overflow menu has a highlight -->
     <string name="mozac_browser_menu_highlighted">Highlighted</string>
     <!-- Label for add-ons submenu section -->
-    <string name="mozac_browser_menu_addons">Add-ons</string>
+    <string name="mozac_browser_menu_addons" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons</string>
+    <!-- Label for extensions submenu section -->
+    <string name="mozac_browser_menu_extensions">Extensions</string>
     <!-- Label for add-ons sub menu item for add-ons manager -->
-    <string name="mozac_browser_menu_addons_manager">Add-ons Manager</string>
+    <string name="mozac_browser_menu_addons_manager" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons Manager</string>
+    <!-- Label for extensions sub menu item for extensions manager -->
+    <string name="mozac_browser_menu_extensions_manager">Extensions Manager</string>
     <!-- Content description for the action bar "up" button -->
     <string name="action_bar_up_description">Navigate up</string>
     <!-- Content description for the action bar "up" button of the add-ons sub menu item -->
-    <string name="mozac_browser_menu_addons_description">Add-ons, navigate up</string>
+    <string name="mozac_browser_menu_addons_description" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons, navigate up</string>
+    <!-- Content description for the action bar "up" button of the extensions sub menu item -->
+    <string name="mozac_browser_menu_extensions_content_description">Extensions, navigate up</string>
 </resources>
diff --git a/mobile/android/android-components/components/browser/menu/src/test/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilderTest.kt b/mobile/android/android-components/components/browser/menu/src/test/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilderTest.kt
index 58b1a8288951..0c5feb0d5b2f 100644
--- a/mobile/android/android-components/components/browser/menu/src/test/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilderTest.kt
+++ b/mobile/android/android-components/components/browser/menu/src/test/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilderTest.kt
@@ -391,7 +391,7 @@ class WebExtensionBrowserMenuBuilderTest {
         assertEquals("ParentBrowserMenuItem", parentMenuItem.javaClass.simpleName)
 
         // the replaced item should have the action title of the WebExtensionBrowserMenuItem
-        assertEquals("Add-ons", parentMenuItem.label)
+        assertEquals(testContext.getString(R.string.mozac_browser_menu_extensions), parentMenuItem.label)
 
         val subMenuItemSize = parentMenuItem.subMenu.adapter.visibleItems.size
 
@@ -450,7 +450,7 @@ class WebExtensionBrowserMenuBuilderTest {
         assertEquals(3, recyclerAdapter.itemCount)
 
         val lastItem = recyclerAdapter.visibleItems[2]
-        assert(lastItem is ParentBrowserMenuItem && lastItem.label == "Add-ons")
+        assert(lastItem is ParentBrowserMenuItem && lastItem.label == testContext.getString(R.string.mozac_browser_menu_extensions))
     }
 
     @Test
diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
index 33b35e8adda8..76ffb0990a45 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
+++ b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt
@@ -247,10 +247,10 @@ class AddonsManagerAdapter(
         holder.titleView.setText(section.title)
         holder.descriptionView.text =
             if (unsupportedAddons.size == 1) {
-                context.getString(R.string.mozac_feature_addons_unsupported_caption)
+                context.getString(R.string.mozac_feature_addons_unsupported_caption_2)
             } else {
                 context.getString(
-                    R.string.mozac_feature_addons_unsupported_caption_plural,
+                    R.string.mozac_feature_addons_unsupported_caption_plural_2,
                     unsupportedAddons.size.toString(),
                 )
             }
diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt
index 8b1e1c9f3249..717c1bdef65c 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt
+++ b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt
@@ -288,7 +288,7 @@ class DefaultAddonUpdater(
     ): Notification {
         val channel = ChannelData(
             NOTIFICATION_CHANNEL_ID,
-            R.string.mozac_feature_addons_updater_notification_channel,
+            R.string.mozac_feature_addons_updater_notification_channel_2,
             NotificationManagerCompat.IMPORTANCE_LOW,
         )
         val channelId = ensureNotificationChannelExists(applicationContext, channel)
diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_footer_section_item.xml b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_footer_section_item.xml
index a749fa5c29c4..1f76ce69d5e2 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_footer_section_item.xml
+++ b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_footer_section_item.xml
@@ -9,7 +9,7 @@
     android:layout_marginEnd="12dp"
     android:layout_marginTop="8dp"
     android:layout_marginBottom="12dp"
-    android:text="@string/mozac_feature_addons_find_more_addons_button_text"
+    android:text="@string/mozac_feature_addons_find_more_extensions_button_text"
     android:textAlignment="center"
     android:textAllCaps="false"
-    android:textSize="14sp" />
\ No newline at end of file
+    android:textSize="14sp" />
diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_header_section_item.xml b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_header_section_item.xml
index 4649d018e78f..28156a186099 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_header_section_item.xml
+++ b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_header_section_item.xml
@@ -24,7 +24,7 @@
             app:srcCompat="@drawable/mozac_ic_warning_fill_24"
             app:tint="?android:attr/textColorLink"/>
         <TextView
-            android:text="@string/mozac_feature_addons_manager_notification_title_text"
+            android:text="@string/mozac_feature_extensions_manager_notification_title_text"
             android:textSize="16sp"
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="bold"
@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"/>
     </LinearLayout>
     <TextView
-        android:text="@string/mozac_feature_addons_manager_notification_content_text"
+        android:text="@string/mozac_feature_extensions_manager_notification_content_text"
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,10 +43,10 @@
     <Button
         android:id="@+id/restart_button"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
-        android:text="@string/mozac_feature_addons_manager_notification_restart_button"
+        android:text="@string/mozac_feature_extensions_manager_notification_restart_button"
         android:textColor="?android:attr/textColorLink"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:paddingVertical="8dp"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/values/strings.xml b/mobile/android/android-components/components/feature/addons/src/main/res/values/strings.xml
index d767e75d74ff..8429f6135abf 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mobile/android/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -90,7 +90,9 @@
     <!-- The rating of the add-on. -->
     <string name="mozac_feature_addons_rating">Rating</string>
     <!-- A link that points to the detail page of the add-on. -->
-    <string name="mozac_feature_addons_more_info_link">More about this add-on</string>
+    <string name="mozac_feature_addons_more_info_link" moz:removedIn="126" tools:ignore="UnusedResources">More about this add-on</string>
+    <!-- A link that points to the detail page of the extension. -->
+    <string name="mozac_feature_addons_more_info_link_2">More about this extension</string>
     <!-- The settings of the add-on. -->
     <string name="mozac_feature_addons_settings">Settings</string>
     <!-- Indicates the add-on is enabled. -->
@@ -158,13 +160,21 @@
     <!-- Label for add-ons sub menu item for add-ons manager-->
     <string name="mozac_feature_addons_addons_manager">Add-ons Manager</string>
     <!-- The title of the "crash" notification in the add-ons manager -->
-    <string name="mozac_feature_addons_manager_notification_title_text">Add-ons are temporarily disabled</string>
+    <string name="mozac_feature_addons_manager_notification_title_text" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons are temporarily disabled</string>
+    <!-- The title of the "crash" notification in the extensions manager -->
+    <string name="mozac_feature_extensions_manager_notification_title_text">Extensions are temporarily disabled</string>
     <!-- The content of the "crash" notification in the add-ons manager -->
-    <string name="mozac_feature_addons_manager_notification_content_text">One or more add-ons stopped working, making your system unstable.</string>
+    <string name="mozac_feature_addons_manager_notification_content_text" moz:removedIn="126" tools:ignore="UnusedResources">One or more add-ons stopped working, making your system unstable.</string>
+    <!-- The content of the "crash" notification in the extensions manager -->
+    <string name="mozac_feature_extensions_manager_notification_content_text">One or more extensions stopped working, making your system unstable.</string>
     <!-- Button to re-enable the add-ons in the "crash" notification -->
-    <string name="mozac_feature_addons_manager_notification_restart_button">Restart add-ons</string>
+    <string name="mozac_feature_addons_manager_notification_restart_button" moz:removedIn="126" tools:ignore="UnusedResources">Restart add-ons</string>
+    <!-- Button to re-enable the extensions in the "crash" notification -->
+    <string name="mozac_feature_extensions_manager_notification_restart_button">Restart extensions</string>
     <!-- Button in the add-ons manager that opens AMO in a tab -->
-    <string name="mozac_feature_addons_find_more_addons_button_text">Find more add-ons</string>
+    <string name="mozac_feature_addons_find_more_addons_button_text" moz:removedIn="126" tools:ignore="UnusedResources">Find more add-ons</string>
+    <!-- Button in the extensions manager that opens AMO in a tab -->
+    <string name="mozac_feature_addons_find_more_extensions_button_text">Find more extensions</string>
     <!-- The label of the allow button, this will be shown to the user when an add-on needs new permissions, with the button the user will indicate that they want to accept the new permissions and update the add-on-->
     <string name="mozac_feature_addons_updater_notification_allow_button">Allow</string>
     <!-- The label of the deny button on a notification, this will be shown to the user when an add-on needs new permissions. Indicates the user denies the new permissions and prevents the add-on from be updated-->
@@ -176,13 +186,15 @@
     <!-- The content of the notification displayed when an add-on needs a new permission-->
     <string name="mozac_feature_addons_updater_notification_content_singular">A new permission is required</string>
     <!-- Name of the "notification channel" used for displaying a notification for updating an add-on. See https://developer.android.com/training/notify-user/channels -->
-    <string name="mozac_feature_addons_updater_notification_channel">Add-on updates</string>
+    <string name="mozac_feature_addons_updater_notification_channel" moz:removedIn="126" tools:ignore="UnusedResources">Add-on updates</string>
+    <!-- Name of the "notification channel" used for displaying a notification for updating an extension. See https://developer.android.com/training/notify-user/channels -->
+    <string name="mozac_feature_addons_updater_notification_channel_2">Extension updates</string>
     <!-- Name of the "notification channel" used for displaying a notification for new supported add-ons. See https://developer.android.com/training/notify-user/channels -->
-    <string name="mozac_feature_addons_supported_checker_notification_channel">Supported add-ons checker</string>
+    <string name="mozac_feature_addons_supported_checker_notification_channel" tools:ignore="UnusedResources">Supported add-ons checker</string>
     <!-- The tile of the notification, this will be shown to the user when one newly supported add-on is available.-->
-    <string name="mozac_feature_addons_supported_checker_notification_title">New add-on available</string>
+    <string name="mozac_feature_addons_supported_checker_notification_title" tools:ignore="UnusedResources">New add-on available</string>
     <!-- The tile of the notification, this will be shown to the user when more than one newly supported add-ons are available.-->
-    <string name="mozac_feature_addons_supported_checker_notification_title_plural">New add-ons available</string>
+    <string name="mozac_feature_addons_supported_checker_notification_title_plural" tools:ignore="UnusedResources">New add-ons available</string>
     <!-- The content of the notification, this will be shown to the user when one newly supported add-on is available. %1$s is the add-on name and %2$s is the app name (in most cases Firefox). -->
     <string name="mozac_feature_addons_supported_checker_notification_content_one">Add %1$s to %2$s</string>
     <!-- The content of the notification, this will be shown to the user when two newly supported add-ons are available. %1$s is the first add-on name. %2$s is the second add-on name. %3$s is the app name (in most cases Firefox). -->
@@ -190,13 +202,17 @@
     <!-- The content of the notification, this will be shown to the user when more than two newly supported add-ons are available. %1$s is the app name (in most cases Firefox). -->
     <string name="mozac_feature_addons_supported_checker_notification_content_more_than_two">Add them to %1$s</string>
     <!-- This is the caption for not yet supported screen caption -->
-    <string name="mozac_feature_addons_not_yet_supported_caption">Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 &amp; beyond.</string>
+    <string name="mozac_feature_addons_not_yet_supported_caption" moz:removedIn="126" tools:ignore="UnusedResources">Firefox add-on technology is modernizing. These add-ons use frameworks that are not compatible with Firefox 75 &amp; beyond.</string>
     <!-- This is the caption for not yet supported screen caption -->
     <string name="mozac_feature_addons_not_yet_supported_caption2">We‘re currently building support for an initial selection of Recommended Extensions.</string>
     <!-- This is the caption for the add-on installation progress overlay -->
-    <string name="mozac_add_on_install_progress_caption">Downloading and verifying add-on&#8230;</string>
+    <string name="mozac_add_on_install_progress_caption" moz:removedIn="126" tools:ignore="UnusedResources">Downloading and verifying add-on&#8230;</string>
+    <!-- This is the caption for the extension installation progress overlay -->
+    <string name="mozac_extension_install_progress_caption">Downloading and verifying extension&#8230;</string>
     <!-- Error shown when something unexpected happened while trying to get the add-on list from the server -->
-    <string name="mozac_feature_addons_failed_to_query_add_ons">Failed to query Add-ons!</string>
+    <string name="mozac_feature_addons_failed_to_query_add_ons" moz:removedIn="126" tools:ignore="UnusedResources">Failed to query Add-ons!</string>
+    <!-- Error shown when something unexpected happened while trying to get the extension list from the server -->
+    <string name="mozac_feature_addons_failed_to_query_extensions">Failed to query Extensions!</string>
     <!-- Error shown when unable to find a translation for an add-on field. %1$s is the locale of the user and %2$s is the default language of the add-on -->
     <string name="mozac_feature_addons_failed_to_translate">Translation not found, for locale %1$s neither default language %2$s</string>
     <!-- Text shown after successfully installed an add-on. %1$s is the add-on name. -->
@@ -204,13 +220,21 @@
     <!-- Text shown after failed to install an add-on. %1$s is the add-on name. -->
     <string name="mozac_feature_addons_failed_to_install">Failed to install %1$s</string>
     <!-- Text shown after failing to install an add-on for which we don't have its name. -->
-    <string name="mozac_feature_addons_failed_to_install_generic">Failed to install this add-on.</string>
+    <string name="mozac_feature_addons_failed_to_install_generic" moz:removedIn="126" tools:ignore="UnusedResources">Failed to install this add-on.</string>
+    <!-- Text shown after failing to install an extension for which we don't have its name. -->
+    <string name="mozac_feature_addons_extension_failed_to_install">Failed to install this extension.</string>
     <!-- Text shown when attempting to install an add-on and a network error happened. -->
-    <string name="mozac_feature_addons_failed_to_install_network_error">This add-on could not be downloaded because of a connection failure.</string>
+    <string name="mozac_feature_addons_failed_to_install_network_error" moz:removedIn="126" tools:ignore="UnusedResources">This add-on could not be downloaded because of a connection failure.</string>
+    <!-- Text shown when attempting to install an extension and a network error happened. -->
+    <string name="mozac_feature_addons_extension_failed_to_install_network_error">This extension could not be downloaded because of a connection failure.</string>
     <!-- Text shown when attempting to install an add-on and the downloaded file is corrupted. -->
-    <string name="mozac_feature_addons_failed_to_install_corrupt_error">This add-on could not be installed because it appears to be corrupt.</string>
+    <string name="mozac_feature_addons_failed_to_install_corrupt_error" moz:removedIn="126" tools:ignore="UnusedResources">This add-on could not be installed because it appears to be corrupt.</string>
+    <!-- Text shown when attempting to install an extension and the downloaded file is corrupted. -->
+    <string name="mozac_feature_addons_extension_failed_to_install_corrupt_error">This extension could not be installed because it appears to be corrupt.</string>
     <!-- Text shown when attempting to install an add-on and an error occurred because the extension was not signed. -->
-    <string name="mozac_feature_addons_failed_to_install_not_signed_error">This add-on could not be installed because it has not been verified.</string>
+    <string name="mozac_feature_addons_failed_to_install_not_signed_error" moz:removedIn="126" tools:ignore="UnusedResources">This add-on could not be installed because it has not been verified.</string>
+    <!-- Text shown when attempting to install an add-on and an error occurred because the extension was not signed. -->
+    <string name="mozac_feature_addons_extension_failed_to_install_not_signed_error">This extension could not be installed because it has not been verified.</string>
     <!-- Text shown when attempting to install an add-on and an error occurred because the extension was incompatible. %1$s is the add-on name, %2$s is the app name and %3$s is the app version. -->
     <string name="mozac_feature_addons_failed_to_install_incompatible_error">%1$s could not be installed because it is not compatible with %2$s %3$s.</string>
     <!-- Text shown when attempting to install a blocklisted add-on. %1$s is the add-on name. -->
@@ -234,9 +258,13 @@
     <!-- Label shown to indicate that the add-on was migrated from a previous version of the app. %1$s is the app name most of the case it will be Firefox. -->
     <string name="mozac_feature_addons_migrated_from_a_previous_version_label" tools:ignore="UnusedResources">This add-on was migrated from a previous version of %1$s</string>
     <!-- Text shown in not yet supported add-ons section in AddonsManagerAdapter. -->
-    <string name="mozac_feature_addons_unsupported_caption">1 add-on</string>
+    <string name="mozac_feature_addons_unsupported_caption" moz:removedIn="126" tools:ignore="UnusedResources">1 add-on</string>
+    <!-- Text shown in not yet supported add-ons section. -->
+    <string name="mozac_feature_addons_unsupported_caption_2">1 extension</string>
     <!-- Text shown in not yet supported add-ons section in AddonsManagerAdapter - plural. %1$s is the number of unsupported add-ons -->
-    <string name="mozac_feature_addons_unsupported_caption_plural">%1$s add-ons</string>
+    <string name="mozac_feature_addons_unsupported_caption_plural" moz:removedIn="126" tools:ignore="UnusedResources">%1$s add-ons</string>
+    <!-- Text shown in not yet supported add-ons section - plural. %1$s is the number of unsupported extensions. -->
+    <string name="mozac_feature_addons_unsupported_caption_plural_2">%1$s extensions</string>
     <!-- Text link to a sumo page for learning more about unsupported add-ons. -->
     <string name="mozac_feature_addons_unsupported_learn_more">Learn more</string>
     <!-- Displayed in the "Status" field for the updater when an add-on has been correctly updated. -->
diff --git a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
index 70fb2da94821..9ff8a083e533 100644
--- a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
+++ b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/ui/AddonsManagerAdapterTest.kt
@@ -486,7 +486,7 @@ class AddonsManagerAdapterTest {
 
         adapter.bindNotYetSupportedSection(unsupportedSectionViewHolder, mock())
         verify(unsupportedSectionViewHolder.descriptionView).setText(
-            testContext.getString(R.string.mozac_feature_addons_unsupported_caption_plural, unsupportedAddons.size),
+            testContext.getString(R.string.mozac_feature_addons_unsupported_caption_plural_2, unsupportedAddons.size),
         )
 
         unsupportedSectionViewHolder.itemView.performClick()
diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/AddonsFragment.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/AddonsFragment.kt
index ab37acca3a35..1e3115a8db62 100644
--- a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/AddonsFragment.kt
+++ b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/AddonsFragment.kt
@@ -104,7 +104,7 @@ class AddonsFragment : Fragment(), AddonsManagerAdapterDelegate {
                 scope.launch(Dispatchers.Main) {
                     Toast.makeText(
                         activity,
-                        addonsR.string.mozac_feature_addons_failed_to_query_add_ons,
+                        addonsR.string.mozac_feature_addons_failed_to_query_extensions,
                         Toast.LENGTH_SHORT,
                     ).show()
                 }
diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/InstalledAddonDetailsActivity.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/InstalledAddonDetailsActivity.kt
index e029ace967eb..1d84830d2989 100644
--- a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/InstalledAddonDetailsActivity.kt
+++ b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/addons/InstalledAddonDetailsActivity.kt
@@ -55,7 +55,7 @@ class InstalledAddonDetailsActivity : AppCompatActivity() {
                 scope.launch(Dispatchers.Main) {
                     Toast.makeText(
                         baseContext,
-                        addonsR.string.mozac_feature_addons_failed_to_query_add_ons,
+                        addonsR.string.mozac_feature_addons_failed_to_query_extensions,
                         Toast.LENGTH_SHORT,
                     ).show()
                 }
diff --git a/mobile/android/android-components/samples/browser/src/main/res/layout/overlay_add_on_progress.xml b/mobile/android/android-components/samples/browser/src/main/res/layout/overlay_add_on_progress.xml
index 4beaa3caac26..77cc30fa5ef2 100644
--- a/mobile/android/android-components/samples/browser/src/main/res/layout/overlay_add_on_progress.xml
+++ b/mobile/android/android-components/samples/browser/src/main/res/layout/overlay_add_on_progress.xml
@@ -23,7 +23,7 @@
             android:drawablePadding="8dp"
             android:gravity="start|center_vertical"
             android:padding="16dp"
-            android:text="@string/mozac_add_on_install_progress_caption"
+            android:text="@string/mozac_extension_install_progress_caption"
             app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />
 
         <Button
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
index 7318bcb13a6a..9480ef5cab19 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
@@ -223,7 +223,7 @@ fun settingsTelemetry() = onView(withText(R.string.preferences_data_collection))
 
 fun loginsAndPassword() = onView(withText(R.string.preferences_passwords_logins_and_passwords)).click()
 
-fun addOns() = onView(withText(R.string.preferences_addons)).click()
+fun addOns() = onView(withText(R.string.preferences_extensions)).click()
 
 fun settingsLanguage() = onView(withText(R.string.preferences_language)).click()
 
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index 4c40aac9987b..a95f9248de49 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -270,17 +270,20 @@ class SettingsRobot {
         onView(withText("Privacy and security"))
             .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
         Log.i(TAG, "verifySettingsView: Verified that the \"Privacy and security\" heading is visible")
-        Log.i(TAG, "verifySettingsView: Trying to perform scroll to the \"Add-ons\" button")
+
+        val extensions = getStringResource(R.string.preferences_extensions)
+        Log.i(TAG, "verifySettingsView: Trying to perform scroll to the \"$extensions\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-                hasDescendant(withText("Add-ons")),
+                hasDescendant(withText(R.string.preferences_extensions)),
             ),
         )
-        Log.i(TAG, "verifySettingsView: Performed scroll to the \"Add-ons\" button")
-        Log.i(TAG, "verifySettingsView: Trying to verify that the \"Add-ons\" button is completely displayed")
-        onView(withText("Add-ons"))
+        Log.i(TAG, "verifySettingsView: Performed scroll to the \"$extensions\" button")
+        Log.i(TAG, "verifySettingsView: Trying to verify that the \"$extensions\" button is completely displayed")
+        onView(withText(R.string.preferences_extensions))
             .check(matches(isCompletelyDisplayed()))
-        Log.i(TAG, "verifySettingsView: Verified that the \"Add-ons\" button is completely displayed")
+        Log.i(TAG, "verifySettingsView: Verified that the \"$extensions\" button is completely displayed")
+
         Log.i(TAG, "verifySettingsView: Trying to perform ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
         settingsList().scrollToEnd(LISTS_MAXSWIPES)
         Log.i(TAG, "verifySettingsView: Performed ${LISTS_MAXSWIPES}x a scroll action to the end of the settings list")
@@ -310,30 +313,32 @@ class SettingsRobot {
 
     // ADVANCED SECTION
     fun verifyAdvancedHeading() {
-        Log.i(TAG, "verifyAdvancedHeading: Trying to perform scroll to the \"Add-ons\" button")
+        val extensions = getStringResource(R.string.preferences_extensions)
+        Log.i(TAG, "verifyAdvancedHeading: Trying to perform scroll to the \"$extensions\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-                hasDescendant(withText("Add-ons")),
+                hasDescendant(withText(R.string.preferences_extensions)),
             ),
         )
-        Log.i(TAG, "verifyAdvancedHeading: Performed scroll to the \"Add-ons\" button")
-        Log.i(TAG, "verifyAdvancedHeading: Trying to verify that the \"Add-ons\" button is completely displayed")
-        onView(withText("Add-ons"))
+        Log.i(TAG, "verifyAdvancedHeading: Performed scroll to the \"$extensions\" button")
+        Log.i(TAG, "verifyAdvancedHeading: Trying to verify that the \"$extensions\" button is completely displayed")
+        onView(withText(R.string.preferences_extensions))
             .check(matches(isCompletelyDisplayed()))
-        Log.i(TAG, "verifyAdvancedHeading: Verified that the \"Add-ons\" button is completely displayed")
+        Log.i(TAG, "verifyAdvancedHeading: Verified that the \"$extensions\" button is completely displayed")
     }
     fun verifyAddons() {
-        Log.i(TAG, "verifyAddons: Trying to perform scroll to the \"Add-ons\" button")
+        val extensions = getStringResource(R.string.preferences_extensions)
+        Log.i(TAG, "verifyAddons: Trying to perform scroll to the \"$extensions\" button")
         onView(withId(R.id.recycler_view)).perform(
             RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
-                hasDescendant(withText("Add-ons")),
+                hasDescendant(withText(R.string.preferences_extensions)),
             ),
         )
-        Log.i(TAG, "verifyAddons: Performed scroll to the \"Add-ons\" button")
-        Log.i(TAG, "verifyAddons: Trying to verify that the \"Add-ons\" button is completely displayed")
+        Log.i(TAG, "verifyAddons: Performed scroll to the \"$extensions\" button")
+        Log.i(TAG, "verifyAddons: Trying to verify that the \"$extensions\" button is completely displayed")
         addonsManagerButton()
             .check(matches(isCompletelyDisplayed()))
-        Log.i(TAG, "verifyAddons: Verified that the \"Add-ons\" button is completely displayed")
+        Log.i(TAG, "verifyAddons: Verified that the \"$extensions\" button is completely displayed")
     }
 
     fun verifyExternalDownloadManagerButton() {
@@ -793,7 +798,7 @@ fun clickRateButtonGooglePlay() {
     rateOnGooglePlayHeading().click()
 }
 
-private fun addonsManagerButton() = onView(withText(R.string.preferences_addons))
+private fun addonsManagerButton() = onView(withText(R.string.preferences_extensions))
 
 private fun goBackButton() =
     onView(CoreMatchers.allOf(withContentDescription("Navigate up")))
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
index a85f13182b95..e7bfcdbcf150 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt
@@ -56,9 +56,9 @@ class SettingsSubMenuAddonsManagerRobot {
         assertUIObjectExists(addonsList(), exists = shouldBeDisplayed)
 
     fun verifyAddonDownloadOverlay() {
-        Log.i(TAG, "verifyAddonDownloadOverlay: Trying to verify that the \"Downloading and verifying add-on\" prompt is displayed")
-        onView(withText(R.string.mozac_add_on_install_progress_caption)).check(matches(isDisplayed()))
-        Log.i(TAG, "verifyAddonDownloadOverlay: Verified that the \"Downloading and verifying add-on\" prompt is displayed")
+        Log.i(TAG, "verifyAddonDownloadOverlay: Trying to verify that the \"Downloading and verifying extension\" prompt is displayed")
+        onView(withText(R.string.mozac_extension_install_progress_caption)).check(matches(isDisplayed()))
+        Log.i(TAG, "verifyAddonDownloadOverlay: Verified that the \"Downloading and verifying extension\" prompt is displayed")
     }
 
     fun verifyAddonPermissionPrompt(addonName: String) {
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
index acbcf804c36f..a20a79088a1d 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
@@ -718,7 +718,7 @@ private fun historyButton() =
 private fun downloadsButton() =
     itemContainingText(getStringResource(R.string.library_downloads))
 private fun addOnsButton() =
-    itemContainingText(getStringResource(R.string.browser_menu_add_ons))
+    itemContainingText(getStringResource(R.string.browser_menu_extensions))
 private fun desktopSiteButton() =
     itemContainingText(getStringResource(R.string.browser_menu_desktop_site))
 private fun desktopSiteToggle(state: Boolean) =
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index 1103b008a518..5eeeeedb3ec2 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -67,7 +67,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
 
     override fun onResume() {
         super.onResume()
-        showToolbar(getString(R.string.preferences_addons))
+        showToolbar(getString(R.string.preferences_extensions))
     }
 
     override fun onDestroyView() {
@@ -150,7 +150,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
                         binding?.let {
                             showSnackBar(
                                 it.root,
-                                getString(R.string.mozac_feature_addons_failed_to_query_add_ons),
+                                getString(R.string.mozac_feature_addons_failed_to_query_extensions),
                             )
                         }
                         binding?.addOnsProgressBar?.isVisible = false
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundController.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundController.kt
index 6432ef73589d..22aa0a4d339a 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundController.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/ExtensionsProcessDisabledForegroundController.kt
@@ -74,7 +74,7 @@ class ExtensionsProcessDisabledForegroundController(
                 return
             }
 
-            val message = context.getString(R.string.addon_process_crash_dialog_message, appName)
+            val message = context.getString(R.string.extension_process_crash_dialog_message, appName)
             var onDismissDialog: (() -> Unit)? = null
             val layout = LayoutInflater.from(context)
                 .inflate(R.layout.crash_extension_dialog, null, false)
@@ -94,7 +94,7 @@ class ExtensionsProcessDisabledForegroundController(
             builder.apply {
                 setCancelable(false)
                 setView(layout)
-                setTitle(R.string.addon_process_crash_dialog_title)
+                setTitle(R.string.extension_process_crash_dialog_title)
             }
 
             val dialog = builder.show()
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
index f99c24b45578..ecd98dda0909 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -109,7 +109,7 @@ class InstalledAddonDetailsFragment : Fragment() {
                     runIfFragmentIsAttached {
                         showSnackBar(
                             binding.root,
-                            getString(R.string.mozac_feature_addons_failed_to_query_add_ons),
+                            getString(R.string.mozac_feature_addons_failed_to_query_extensions),
                         )
                         findNavController().popBackStack()
                     }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
index 06de6146621a..52617feb2a37 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/extension/WebExtensionPromptFeature.kt
@@ -171,21 +171,21 @@ class WebExtensionPromptFeature(
                 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)
+                    context.getString(R.string.mozac_feature_addons_extension_failed_to_install)
                 }
             }
 
             is WebExtensionInstallException.NetworkFailure -> {
-                context.getString(R.string.mozac_feature_addons_failed_to_install_network_error)
+                context.getString(R.string.mozac_feature_addons_extension_failed_to_install_network_error)
             }
 
             is WebExtensionInstallException.CorruptFile -> {
-                context.getString(R.string.mozac_feature_addons_failed_to_install_corrupt_error)
+                context.getString(R.string.mozac_feature_addons_extension_failed_to_install_corrupt_error)
             }
 
             is WebExtensionInstallException.NotSigned -> {
                 context.getString(
-                    R.string.mozac_feature_addons_failed_to_install_not_signed_error,
+                    R.string.mozac_feature_addons_extension_failed_to_install_not_signed_error,
                 )
             }
 
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index e0e8e2812d76..f2f7ef7522ad 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -143,7 +143,7 @@ class HomeMenu(
         }
 
         val extensionsItem = BrowserMenuImageText(
-            context.getString(R.string.browser_menu_add_ons),
+            context.getString(R.string.browser_menu_extensions),
             R.drawable.ic_addons_extensions,
             primaryTextColor,
         ) {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 9deff4149a26..d392ba8697e6 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -370,7 +370,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
                 val binding = AmoCollectionOverrideDialogBinding.bind(dialogView)
                 AlertDialog.Builder(context).apply {
-                    setTitle(context.getString(R.string.preferences_customize_amo_collection))
+                    setTitle(context.getString(R.string.preferences_customize_extension_collection))
                     setView(dialogView)
                     setNegativeButton(R.string.customize_addon_collection_cancel) { dialog: DialogInterface, _ ->
                         dialog.cancel()
@@ -383,7 +383,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
                         Toast.makeText(
                             context,
-                            getString(R.string.toast_customize_addon_collection_done),
+                            getString(R.string.toast_customize_extension_collection_done),
                             Toast.LENGTH_LONG,
                         ).show()
 
diff --git a/mobile/android/fenix/app/src/main/res/layout/crash_extension_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/crash_extension_dialog.xml
index 835d4110c3fc..bab2ec4b6e00 100644
--- a/mobile/android/fenix/app/src/main/res/layout/crash_extension_dialog.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/crash_extension_dialog.xml
@@ -18,14 +18,14 @@
             android:layout_marginHorizontal="24dp"
             android:layout_marginVertical="8dp"
             android:textColor="?attr/textPrimary"
-            tools:text="@string/addon_process_crash_dialog_message" />
+            tools:text="@string/extension_process_crash_dialog_message" />
 
         <Button
             android:id="@+id/positive"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/addon_process_crash_dialog_retry_button_text"
+            android:text="@string/extension_process_crash_dialog_retry_button_text"
             android:textAlignment="textEnd"
             android:textColor="?textAccent" />
 
@@ -34,7 +34,7 @@
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/addon_process_crash_dialog_disable_addons_button_text"
+            android:text="@string/extension_process_crash_dialog_disable_extensions_button_text"
             android:textAlignment="textEnd"
             android:textColor="?textAccent" />
     </LinearLayout>
diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_add_on_details.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_add_on_details.xml
index 1ab400991322..23e2322e9d7a 100644
--- a/mobile/android/fenix/app/src/main/res/layout/fragment_add_on_details.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/fragment_add_on_details.xml
@@ -226,7 +226,7 @@
             android:minHeight="48dp"
             android:clickable="true"
             android:focusable="true"
-            android:text="@string/mozac_feature_addons_more_info_link"
+            android:text="@string/mozac_feature_addons_more_info_link_2"
             android:textColor="?textAccent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/detail_url_divider" />
diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_add_ons_management.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_add_ons_management.xml
index bdd07cbaaa22..39d1a2881bad 100644
--- a/mobile/android/fenix/app/src/main/res/layout/fragment_add_ons_management.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/fragment_add_ons_management.xml
@@ -36,7 +36,7 @@
         android:padding="4dp"
         android:layout_gravity="center"
         android:gravity="center"
-        android:text="@string/no_add_ons"
+        android:text="@string/extensions_management_no_extensions"
         android:textAlignment="center"
         android:textColor="?attr/textSecondary"
         android:textSize="16sp"
diff --git a/mobile/android/fenix/app/src/main/res/layout/overlay_add_on_progress.xml b/mobile/android/fenix/app/src/main/res/layout/overlay_add_on_progress.xml
index d12dc2027a9b..c0134d24246d 100644
--- a/mobile/android/fenix/app/src/main/res/layout/overlay_add_on_progress.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/overlay_add_on_progress.xml
@@ -23,7 +23,7 @@
             android:drawablePadding="8dp"
             android:gravity="start|center_vertical"
             android:padding="16dp"
-            android:text="@string/mozac_add_on_install_progress_caption"
+            android:text="@string/mozac_extension_install_progress_caption"
             app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />
 
         <Button
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
index 5605c12d23fa..23ed49fe5e94 100644
--- a/mobile/android/fenix/app/src/main/res/values/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -179,11 +179,13 @@
     <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
     <string name="browser_menu_stop">Stop</string>
     <!-- Browser menu button that opens the addon manager -->
-    <string name="browser_menu_add_ons">Add-ons</string>
+    <string name="browser_menu_add_ons" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons</string>
+    <!-- Browser menu button that opens the extensions manager -->
+    <string name="browser_menu_extensions">Extensions</string>
     <!-- Browser menu button that opens account settings -->
     <string name="browser_menu_account_settings">Account info</string>
     <!-- Text displayed when there are no add-ons to be shown -->
-    <string name="no_add_ons">No add-ons here</string>
+    <string name="no_add_ons" moz:removedIn="126" tools:ignore="UnusedResources">No add-ons here</string>
     <!-- Browser menu button that sends a user to help articles -->
     <string name="browser_menu_help">Help</string>
     <!-- Browser menu button that sends a to a the what's new article -->
@@ -234,6 +236,10 @@
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Customize homepage</string>
 
+    <!-- Extensions management fragment -->
+    <!-- Text displayed when there are no extensions to be shown -->
+    <string name="extensions_management_no_extensions">No extensions here</string>
+
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Home screen</string>
@@ -571,9 +577,13 @@
     <string name="quit_application">Quitting the application to apply changes…</string>
 
     <!-- Preference for add_ons -->
-    <string name="preferences_addons">Add-ons</string>
+    <string name="preferences_addons" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons</string>
+    <!-- Preference for extensions -->
+    <string name="preferences_extensions">Extensions</string>
     <!-- Preference for installing a local add-on -->
-    <string name="preferences_install_local_addon">Install add-on from file</string>
+    <string name="preferences_install_local_addon" moz:removedIn="126" tools:ignore="UnusedResources">Install add-on from file</string>
+    <!-- Preference for installing a local extension -->
+    <string name="preferences_install_local_extension">Install extension from file</string>
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Notifications</string>
     <!-- Summary for notification preference indicating notifications are allowed -->
@@ -583,7 +593,9 @@
 
     <!-- Add-on Preferences -->
     <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
-    <string name="preferences_customize_amo_collection">Custom Add-on collection</string>
+    <string name="preferences_customize_amo_collection" moz:removedIn="126" tools:ignore="UnusedResources">Custom Add-on collection</string>
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_extension_collection">Custom Extension collection</string>
     <!-- Button caption to confirm the add-on collection configuration -->
     <string name="customize_addon_collection_ok">OK</string>
     <!-- Button caption to abort the add-on collection configuration -->
@@ -593,7 +605,9 @@
     <!-- Hint displayed on input field for custom collection user ID-->
     <string name="customize_addon_collection_user_hint">Collection owner (User ID)</string>
     <!-- Toast shown after confirming the custom add-on collection configuration -->
-    <string name="toast_customize_addon_collection_done">Add-on collection modified. Quitting the application to apply changes…</string>
+    <string name="toast_customize_addon_collection_done" moz:removedIn="126" tools:ignore="UnusedResources">Add-on collection modified. Quitting the application to apply changes…</string>
+    <!-- Toast shown after confirming the custom extension collection configuration -->
+    <string name="toast_customize_extension_collection_done">Extension collection modified. Quitting the application to apply changes…</string>
 
     <!-- Customize Home -->
     <!-- Header text for jumping back into the recent tab in customize the home screen -->
@@ -646,21 +660,35 @@
 
     <!-- Add-ons general availability nimbus message-->
     <!-- Title of the Nimbus message for add-ons general availability-->
-    <string name="addon_ga_message_title" tools:ignore="UnusedResources">New add-ons now available</string>
+    <string name="addon_ga_message_title" moz:removedIn="126" tools:ignore="UnusedResources">New add-ons now available</string>
+    <!-- Title of the Nimbus message for extension general availability-->
+    <string name="addon_ga_message_title_2" tools:ignore="UnusedResources">New extensions now available</string>
     <!-- Body of the Nimbus message for add-ons general availability. 'Firefox' intentionally hardcoded here-->
     <string name="addon_ga_message_body" tools:ignore="UnusedResources">Check out 100+ new extensions that let you make Firefox your own.</string>
     <!-- Button text of the Nimbus message for add-ons general availability. -->
-    <string name="addon_ga_message_button" tools:ignore="UnusedResources">Explore add-ons</string>
+    <string name="addon_ga_message_button" moz:removedIn="126" tools:ignore="UnusedResources">Explore add-ons</string>
+    <!-- Button text of the Nimbus message for extensions general availability. -->
+    <string name="addon_ga_message_button_2" tools:ignore="UnusedResources">Explore extensions</string>
 
-    <!-- Add-on process crash dialog to user -->
+    <!-- Extension 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>
+    <string name="addon_process_crash_dialog_title" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons are temporarily disabled</string>
+    <!-- Title of the extension crash dialog shown to the user when enough errors have occurred with extensions and they need to be temporarily disabled -->
+    <string name="extension_process_crash_dialog_title">Extensions 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>
+    <string name="addon_process_crash_dialog_message" moz:removedIn="126" 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 is a message shown to the user when too many errors have occurred with the extensions process and they have been disabled.
+    The user can decide if they would like to continue trying to start extensions or if they'd rather continue without them.
+    The first parameter is the application name. -->
+    <string name="extension_process_crash_dialog_message">One or more extensions stopped working, making your system unstable. %1$s unsuccessfully tried to restart the extension(s).\n\nExtensions won’t be restarted during your current session.\n\nRemoving or disabling extensions 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>
+    <string name="addon_process_crash_dialog_retry_button_text" moz:removedIn="126" tools:ignore="UnusedResources">Try restarting add-ons</string>
+    <!-- Button text on the extension crash dialog to prompt the user to try restarting the extensions but the dialog will reappear if it is unsuccessful again -->
+    <string name="extension_process_crash_dialog_retry_button_text" tools:ignore="UnusedResources">Try restarting extensions</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>
+    <string name="addon_process_crash_dialog_disable_addons_button_text" moz:removedIn="126" tools:ignore="UnusedResources">Continue with add-ons disabled</string>
+    <!-- Button text on the extension crash dialog to prompt the user to continue with all extensions disabled. -->
+    <string name="extension_process_crash_dialog_disable_extensions_button_text">Continue with extensions disabled</string>
 
     <!-- Account Preferences -->
     <!-- Preference for managing your account via accounts.firefox.com -->
diff --git a/mobile/android/fenix/app/src/main/res/xml/preferences.xml b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
index fce685d732a8..0bc93722febe 100644
--- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml
+++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
@@ -147,18 +147,18 @@
         <androidx.preference.Preference
             android:key="@string/pref_key_addons"
             app:iconSpaceReserved="false"
-            android:title="@string/preferences_addons" />
+            android:title="@string/preferences_extensions" />
 
         <androidx.preference.Preference
             android:key="@string/pref_key_install_local_addon"
             app:iconSpaceReserved="false"
             app:isPreferenceVisible="false"
-            android:title="@string/preferences_install_local_addon" />
+            android:title="@string/preferences_install_local_extension" />
 
         <androidx.preference.Preference
             android:key="@string/pref_key_override_amo_collection"
             app:iconSpaceReserved="false"
-            android:title="@string/preferences_customize_amo_collection" />
+            android:title="@string/preferences_customize_extension_collection" />
 
         <androidx.preference.Preference
             android:key="@string/pref_key_open_links_in_apps"
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
index cc23b1227524..f284015008bb 100644
--- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/extension/WebExtensionPromptFeatureTest.kt
@@ -76,7 +76,7 @@ class WebExtensionPromptFeatureTest {
         )
         val expectedMessage =
             testContext.getString(
-                R.string.mozac_feature_addons_failed_to_install_network_error,
+                R.string.mozac_feature_addons_extension_failed_to_install_network_error,
                 "name",
             )
 
@@ -150,7 +150,7 @@ class WebExtensionPromptFeatureTest {
             throwable = Exception(),
         )
         val expectedMessage =
-            testContext.getString(R.string.mozac_feature_addons_failed_to_install_generic)
+            testContext.getString(R.string.mozac_feature_addons_extension_failed_to_install)
 
         webExtensionPromptFeature.handleInstallationFailedRequest(
             exception = exception,
@@ -167,7 +167,7 @@ class WebExtensionPromptFeatureTest {
             throwable = Exception(),
         )
         val expectedMessage =
-            testContext.getString(R.string.mozac_feature_addons_failed_to_install_corrupt_error)
+            testContext.getString(R.string.mozac_feature_addons_extension_failed_to_install_corrupt_error)
 
         webExtensionPromptFeature.handleInstallationFailedRequest(
             exception = exception,
@@ -184,7 +184,7 @@ class WebExtensionPromptFeatureTest {
             throwable = Exception(),
         )
         val expectedMessage =
-            testContext.getString(R.string.mozac_feature_addons_failed_to_install_not_signed_error)
+            testContext.getString(R.string.mozac_feature_addons_extension_failed_to_install_not_signed_error)
 
         webExtensionPromptFeature.handleInstallationFailedRequest(
             exception = exception,
-- 
2.11.4.GIT