From a15ade8b0bfa3ad47e5eca6b1067f599e6445bf8 Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot <release+l10n-automation-bot@mozilla.com>
Date: Mon, 7 Feb 2022 00:05:03 +0000
Subject: [PATCH] [fenix] Import l10n.

---
 app/src/main/res/values-es-rES/strings.xml |  68 ++--
 app/src/main/res/values-hr/strings.xml     |  83 +++--
 app/src/main/res/values-ja/strings.xml     |  13 +-
 app/src/main/res/values-kab/strings.xml    |  13 +-
 app/src/main/res/values-kk/strings.xml     |  13 +-
 app/src/main/res/values-oc/strings.xml     |  13 +-
 app/src/main/res/values-pt-rPT/strings.xml |   6 +-
 app/src/main/res/values-rm/strings.xml     |  13 +-
 app/src/main/res/values-ru/strings.xml     |   6 +-
 app/src/main/res/values-th/strings.xml     | 398 +++++++++------------
 10 files changed, 312 insertions(+), 314 deletions(-)

diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 70f390de6d..ac5037dd04 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -25,8 +25,6 @@
 
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string moz:removedIn="96" name="open_tab_tray_single" tools:ignore="UnusedResources">1 pestaña abierta. Toca para cambiar de pestaña.</string>
-    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
-    <string moz:removedIn="95" name="open_tab_tray_plural" tools:ignore="UnusedResources">%1$s pestañas abiertas. Toca para cambiar de pestaña.</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 seleccionadas</string>
@@ -121,8 +119,6 @@
     <string name="tab_tray_inactive_auto_close_body">Firefox puede cerrar pestañas que no has visto durante el último mes.</string>
     <!-- Content description for close button in the auto-close dialog of the inactive tabs. -->
     <string name="tab_tray_inactive_auto_close_button_content_description">Cerrar</string>
-    <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
-    <string moz:removedIn="95" name="tab_tray_inactive_turn_on_auto_close_button" tools:ignore="UnusedResources">Activar el cierre automático</string>
 
     <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
     <string name="tab_tray_inactive_turn_on_auto_close_button_2">Activar el cierre automático</string>
@@ -134,9 +130,6 @@
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">Nueva pestaña privada</string>
 
-    <!-- Heading for the Top Sites block -->
-    <string moz:removedIn="95" name="home_screen_top_sites_heading" tools:ignore="UnusedResources">Sitios favoritos</string>
-
     <!-- Recent Tabs -->
     <!-- Header text for jumping back into the recent tab in the home screen -->
     <string name="recent_tabs_header">Volver a esta pestaña</string>
@@ -185,8 +178,6 @@
     <string name="browser_menu_refresh">Actualizar</string>
     <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
     <string name="browser_menu_stop">Detener</string>
-    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
-    <string moz:removedIn="95" name="browser_menu_bookmark" tools:ignore="UnusedResources">Marcador</string>
     <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
     <string moz:removedIn="96" name="browser_menu_edit_bookmark" tools:ignore="UnusedResources">Editar marcador</string>
     <!-- Browser menu button that opens the addon manager -->
@@ -251,7 +242,7 @@
     <string name="browser_menu_edit">Editar</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Personalizar inicio</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Personalizar inicio</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar la página de inicio</string>
     <!-- Browser Toolbar -->
@@ -484,6 +475,26 @@
     <!-- Title for the customize home screen section with Pocket. -->
     <string name="customize_toggle_pocket">Pocket</string>
 
+    <!-- Title for the opening wallpaper settings screen -->
+    <string name="customize_wallpapers">Fondos de pantalla</string>
+    <!-- Title for the customize home screen section with sponsored shortcuts. -->
+    <string name="customize_toggle_contile">Accesos directos patrocinados</string>
+
+    <!-- Wallpapers -->
+    <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
+    <string name="wallpapers_item_name_content_description">Elemento de fondo de pantalla: %1$s</string>
+    <!-- Snackbar message for when wallpaper is selected -->
+    <string name="wallpaper_updated_snackbar_message">¡Fondo de pantalla actualizado!</string>
+    <!-- Snackbar label for action to view selected wallpaper -->
+    <string name="wallpaper_updated_snackbar_action">Ver</string>
+    <!-- Label for switch which toggles the "tap-to-switch" behavior on home screen logo -->
+    <string name="wallpaper_tap_to_change_switch_label">Toca el logo para cambiar el fondo de pantalla</string>
+    <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
+    <string name="wallpaper_tap_to_change_switch_description">Recorre y actualiza la imagen sin salir de la página de inicio.</string>
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Logotipo de Firefox - cambiar el fondo de pantalla, botón</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">El complemento no es compatible</string>
@@ -595,8 +606,6 @@
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Activar Sync</string>
-    <!-- Preference for pairing -->
-    <string moz:removedIn="95" name="preferences_sync_pair" tools:ignore="UnusedResources">Escanear código de emparejamiento en la versión de escritorio de Firefox</string>
     <!-- Preference for account login -->
     <string moz:removedIn="96" name="preferences_sync_sign_in" tools:ignore="UnusedResources">Iniciar sesión</string>
 
@@ -784,8 +793,6 @@
     <string moz:removedIn="96" name="tab_tray_title" tools:ignore="UnusedResources">Pestañas abiertas</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
     <string moz:removedIn="96" name="tab_tray_menu_item_save" tools:ignore="UnusedResources">Guardar en la colección</string>
-    <!-- Text shown in the menu for the collection selector -->
-    <string moz:removedIn="95" name="tab_tray_menu_select" tools:ignore="UnusedResources">Seleccionar</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">Compartir todas las pestañas</string>
     <!-- Text shown in the menu to view recently closed tabs -->
@@ -944,8 +951,6 @@
     <!-- Bookmarks -->
     <!-- Content description for bookmarks library menu -->
     <string moz:removedIn="96" name="bookmark_menu_content_description" tools:ignore="UnusedResources">Menú del marcador</string>
-    <!-- Screen title for editing bookmarks -->
-    <string moz:removedIn="95" name="bookmark_edit" tools:ignore="UnusedResources">Editar marcador</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string moz:removedIn="96" name="bookmark_select_folder" tools:ignore="UnusedResources">Seleccionar carpeta</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
@@ -1244,7 +1249,7 @@
     <string name="snackbar_deleted_undo">DESHACER</string>
 
     <!-- Text shown in snackbar when user removes a top site -->
-    <string moz:removedIn="96" name="snackbar_top_site_removed" tools:ignore="UnusedResources">Sitio eliminado</string>
+    <string name="snackbar_top_site_removed">Sitio eliminado</string>
     <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
     <string moz:removedIn="96" name="a11y_dialog_deleted_undo" tools:ignore="UnusedResources">Deshacer</string>
     <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
@@ -1906,6 +1911,8 @@
     <string name="bookmark_deletion_confirmation">¿Seguro que quieres eliminar este marcador?</string>
     <!-- Browser menu button that adds a top site to the home fragment -->
     <string name="browser_menu_add_to_top_sites">Añadir a sitios favoritos</string>
+    <!-- Browser menu button that removes a top site from the home fragment -->
+    <string name="browser_menu_remove_from_top_sites">Eliminar de los sitios más usados</string>
     <!-- text shown before the issuer name to indicate who its verified by, parameter is the name of
      the certificate authority that verified the ticket-->
     <string name="certificate_info_verified_by">Verificado por: %1$s</string>
@@ -1980,10 +1987,12 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Vale, entendido</string>
 
-    <!-- Label for the preference to show the most visited top sites on the homepage -->
-    <string name="top_sites_toggle_top_recent_sites_3">Sitios favoritos más visitados</string>
+    <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
+    <string moz:removedIn="98" name="top_sites_toggle_top_recent_sites_3" tools:ignore="UnusedResources">Sitios favoritos más visitados</string>
 
-    <!-- Title text displayed in the rename top site dialog. -->
+    <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
+    <string name="top_sites_toggle_top_recent_sites_4">Accesos directos</string>
+	<!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">Nombre</string>
 	<!-- Hint for renaming title of a top site -->
 	<string name="top_site_name_hint">Nombre del sitio principal</string>
@@ -1992,17 +2001,18 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Cancelar</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Ajustes</string>
+    <!-- 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">Nuestros patrocinadores y tu privacidad</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <string name="top_sites_sponsored_label">Patrocinado</string>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Pestañas inactivas</string>
     <!-- Content description for closing all inactive tabs -->
     <string name="inactive_tabs_delete_all">Cerrar todas las pestañas inactivas</string>
-    <!-- A description below the section of "inactive" tabs to notify the user when those tabs will be closed, if appropriate. See strings inactive_tabs_30_days and inactive_tabs_7_days for placeholders options. -->
-    <string moz:removedIn="95" name="inactive_tabs_description" tools:ignore="UnusedResources">Las pestañas están disponibles aquí durante %s. Después de ese tiempo, las pestañas se cerrarán automáticamente.</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_30_days" tools:ignore="UnusedResources">30 días</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_7_days" tools:ignore="UnusedResources">1 semana</string>
 
     <!-- Inactive tabs auto-close message in the tabs tray -->
     <!-- The header text of the auto-close message when the user is asked if they want to turn on the auto-closing of inactive tabs. -->
@@ -2017,8 +2027,6 @@
 
     <!-- Inactive tabs survey -->
     <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_header" tools:ignore="UnusedResources">Ayúdanos a mejorar</string>
-    <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
     <string name="inactive_tabs_survey_header_1">Ayuda a mejorar Firefox</string>
 
     <!-- Content text for the inactive tabs survey asking the primary survey feedback question. -->
@@ -2029,12 +2037,8 @@
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_do_it_myself">Me gusta limpiar las pestañas viejas yo mismo</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_long_option" tools:ignore="UnusedResources">El tiempo para pasarlas a inactivas es demasiado largo</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_long_option_1">El período de dos semanas es demasiado largo</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_short_option" tools:ignore="UnusedResources">El tiempo para pasarlas a inactivas es demasiado corto</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_short_option_1">El período de dos semanas es demasiado corto</string>
     <!-- Confirmation button text to submit the feedback for the inactive tabs survey. -->
     <string name="inactive_tabs_survey_send_button">Enviar</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2bda488d94..a473850b1b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -23,8 +23,6 @@
 
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string moz:removedIn="96" name="open_tab_tray_single" tools:ignore="UnusedResources">1 otvorena kartica. Dodirni za prebacivanje kartica.</string>
-    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
-    <string moz:removedIn="95" name="open_tab_tray_plural" tools:ignore="UnusedResources">%1$s otvorene kartice. Dodirni za prebacivanje kartica.</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">Odabrano: %1$d</string>
@@ -58,7 +56,9 @@
     <!-- Title for the button which navigates the user to show all of their saved bookmarks. -->
     <string name="recently_saved_show_all">Prikaži sve</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">Tipka za prikaz svih spremljenih zabilješki</string>
+    <string name="recently_saved_show_all_content_description_2">Prikaži sve spremljene zabilješke</string>
+    <!-- Content description for the button which navigates the user to show all of their saved bookmarks. -->
+    <string moz:removedIn="97" name="recently_saved_show_all_content_description" tools:ignore="UnusedResources">Tipka za prikaz svih spremljenih zabilješki</string>
 
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s proizvodi Mozilla.</string>
@@ -114,8 +114,6 @@
     <string name="tab_tray_inactive_auto_close_body">Firefox može zatvoriti kartice koje nisu otvorene posljednjih mjesec dana.</string>
     <!-- Content description for close button in the auto-close dialog of the inactive tabs. -->
     <string name="tab_tray_inactive_auto_close_button_content_description">Zatvori</string>
-    <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
-    <string moz:removedIn="95" name="tab_tray_inactive_turn_on_auto_close_button" tools:ignore="UnusedResources">Uključi automatsko zatvaranje</string>
 
     <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
     <string name="tab_tray_inactive_turn_on_auto_close_button_2">Uključi automatsko zatvaranje</string>
@@ -127,9 +125,6 @@
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">Nova privatna kartica</string>
 
-    <!-- Heading for the Top Sites block -->
-    <string moz:removedIn="95" name="home_screen_top_sites_heading" tools:ignore="UnusedResources">Omiljene stranice</string>
-
     <!-- Recent Tabs -->
     <!-- Header text for jumping back into the recent tab in the home screen -->
     <string name="recent_tabs_header">Vrati se natrag</string>
@@ -137,7 +132,9 @@
     <string name="recent_tabs_show_all">Prikaži sve</string>
 
     <!-- Content description for the button which navigates the user to show all recent tabs in the tabs tray. -->
-    <string name="recent_tabs_show_all_content_description">Tipka za prikaz svih nedavnih kartica</string>
+    <string name="recent_tabs_show_all_content_description_2">Prikaži tipku za prikaz svih nedavnih kartica</string>
+    <!-- Content description for the button which navigates the user to show all recent tabs in the tabs tray. -->
+    <string moz:removedIn="97" name="recent_tabs_show_all_content_description2" tools:ignore="UnusedResources">Prikaži sve nedavne kartice</string>
     <!-- Title for showing a group item in the 'Jump back in' section of the new tab
         The first parameter is the search term that the user used. (for example: your search for "cat")-->
     <string name="recent_tabs_search_term">Tvoja pretraga za \&quot;%1$s\&quot;</string>
@@ -161,7 +158,9 @@
     <string name="recently_visited_menu_item_remove">Ukloni</string>
 
     <!-- Content description for the button which navigates the user to show all of their history. -->
-    <string name="past_explorations_show_all_content_description">Tipka za prikaz svih nedavnih istraživanja</string>
+    <string name="past_explorations_show_all_content_description_2">Prikaži svu povijest</string>
+    <!-- Content description for the button which navigates the user to show all of their history. -->
+    <string moz:removedIn="97" name="past_explorations_show_all_content_description" tools:ignore="UnusedResources">Tipka za prikaz svih nedavnih istraživanja</string>
 
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
@@ -174,8 +173,6 @@
     <string name="browser_menu_refresh">Osvježi</string>
     <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
     <string name="browser_menu_stop">Zaustavi</string>
-    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
-    <string moz:removedIn="95" name="browser_menu_bookmark" tools:ignore="UnusedResources">Zabilješka</string>
     <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
     <string moz:removedIn="96" name="browser_menu_edit_bookmark" tools:ignore="UnusedResources">Uredi zabilješku</string>
     <!-- Browser menu button that opens the addon manager -->
@@ -238,7 +235,7 @@
     <string name="browser_menu_edit">Uredi</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Prilagodi početnu</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Prilagodi početnu</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Prilagodi početnu</string>
     <!-- Browser Toolbar -->
@@ -469,6 +466,26 @@
     <!-- Title for the customize home screen section with Pocket. -->
     <string name="customize_toggle_pocket">Pocket</string>
 
+    <!-- Title for the opening wallpaper settings screen -->
+    <string name="customize_wallpapers">Pozadine</string>
+    <!-- Title for the customize home screen section with sponsored shortcuts. -->
+    <string name="customize_toggle_contile">Sponzorirani prečaci</string>
+
+    <!-- Wallpapers -->
+    <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
+    <string name="wallpapers_item_name_content_description">Stavke pozadine: %1$s</string>
+    <!-- Snackbar message for when wallpaper is selected -->
+    <string name="wallpaper_updated_snackbar_message">Pozadina ažurirana!</string>
+    <!-- Snackbar label for action to view selected wallpaper -->
+    <string name="wallpaper_updated_snackbar_action">Prikaži</string>
+    <!-- Label for switch which toggles the "tap-to-switch" behavior on home screen logo -->
+    <string name="wallpaper_tap_to_change_switch_label">Dodirnite logotip za promjenu pozadine</string>
+    <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
+    <string name="wallpaper_tap_to_change_switch_description">Kruži i ažuriraj sliku bez napuštanja početne stranice.</string>
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Firefox logo - promijenite pozadinu, tipka</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">Dodatak nije podržan</string>
@@ -578,8 +595,6 @@
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Uključi sinkronizaciju</string>
-    <!-- Preference for pairing -->
-    <string moz:removedIn="95" name="preferences_sync_pair" tools:ignore="UnusedResources">Skeniraj kôd za uparivanje u Firefoxu za računalo</string>
     <!-- Preference for account login -->
     <string moz:removedIn="96" name="preferences_sync_sign_in" tools:ignore="UnusedResources">Prijavi se</string>
     <!-- Preference for reconnecting to FxA sync -->
@@ -770,8 +785,6 @@
     <string moz:removedIn="96" name="tab_tray_title" tools:ignore="UnusedResources">Otvorene kartice</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
     <string moz:removedIn="96" name="tab_tray_menu_item_save" tools:ignore="UnusedResources">Spremi u zbirku</string>
-    <!-- Text shown in the menu for the collection selector -->
-    <string moz:removedIn="95" name="tab_tray_menu_select" tools:ignore="UnusedResources">Odaberi</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">Podijeli sve kartice</string>
     <!-- Text shown in the menu to view recently closed tabs -->
@@ -931,8 +944,6 @@
     <!-- Bookmarks -->
     <!-- Content description for bookmarks library menu -->
     <string moz:removedIn="96" name="bookmark_menu_content_description" tools:ignore="UnusedResources">Izbornik za zabilješke</string>
-    <!-- Screen title for editing bookmarks -->
-    <string moz:removedIn="95" name="bookmark_edit" tools:ignore="UnusedResources">Uredi zabilješku</string>
     <!-- Screen title for selecting a bookmarks folder -->
     <string moz:removedIn="96" name="bookmark_select_folder" tools:ignore="UnusedResources">Odaberi mapu</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
@@ -1031,6 +1042,8 @@
     <string name="preference_phone_feature_notification">Obavijest</string>
     <!-- Preference for altering the persistent storage access for all websites -->
     <string name="preference_phone_feature_persistent_storage">Trajna pohrana</string>
+    <!-- Preference for altering the storage access setting for all websites -->
+    <string name="preference_phone_feature_cross_origin_storage_access">Međustranični kolačići</string>
     <!-- Preference for altering the EME access for all websites -->
     <string name="preference_phone_feature_media_key_system_access">Sadržaj kontroliran DRM-om</string>
     <!-- Label that indicates that a permission must be asked always -->
@@ -1214,7 +1227,7 @@
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">PONIŠTI</string>
     <!-- Text shown in snackbar when user removes a top site -->
-    <string moz:removedIn="96" name="snackbar_top_site_removed" tools:ignore="UnusedResources">Stranica je uklonjena</string>
+    <string name="snackbar_top_site_removed">Stranica je uklonjena</string>
     <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
     <string moz:removedIn="96" name="a11y_dialog_deleted_undo" tools:ignore="UnusedResources">Poništi</string>
     <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
@@ -1873,6 +1886,8 @@
     <string name="bookmark_deletion_confirmation">Sigurno želiš izbrisati ovu zabilješku?</string>
     <!-- Browser menu button that adds a top site to the home fragment -->
     <string name="browser_menu_add_to_top_sites">Dodaj u omiljene stranice</string>
+    <!-- Browser menu button that removes a top site from the home fragment -->
+    <string name="browser_menu_remove_from_top_sites">Ukloni iz popularnih stranica</string>
     <!-- text shown before the issuer name to indicate who its verified by, parameter is the name of
      the certificate authority that verified the ticket-->
     <string name="certificate_info_verified_by">Potvrđuje: %1$s</string>
@@ -1947,10 +1962,12 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">U redu, shvaćam</string>
 
-    <!-- Label for the preference to show the most visited top sites on the homepage -->
-    <string name="top_sites_toggle_top_recent_sites_3">Naposjećenije omiljene stranice</string>
+    <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
+    <string moz:removedIn="98" name="top_sites_toggle_top_recent_sites_3" tools:ignore="UnusedResources">Naposjećenije omiljene stranice</string>
 
-    <!-- Title text displayed in the rename top site dialog. -->
+    <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
+    <string name="top_sites_toggle_top_recent_sites_4">Prečaci</string>
+	<!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">Naziv</string>
 	<!-- Hint for renaming title of a top site -->
 	<string name="top_site_name_hint">Naziv omiljene stranice</string>
@@ -1959,17 +1976,18 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Odustani</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Postavke</string>
+    <!-- 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 sponzori i tvoja privatnost</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <string name="top_sites_sponsored_label">Sponzorirano</string>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Neaktivne kartice</string>
     <!-- Content description for closing all inactive tabs -->
     <string name="inactive_tabs_delete_all">Zatvori sve neaktivne kartice</string>
-    <!-- A description below the section of "inactive" tabs to notify the user when those tabs will be closed, if appropriate. See strings inactive_tabs_30_days and inactive_tabs_7_days for placeholders options. -->
-    <string moz:removedIn="95" name="inactive_tabs_description" tools:ignore="UnusedResources">Kartice su dostupne ovdje %s. Nakon tog vremena, kartice će automatski biti zatvorene.</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_30_days" tools:ignore="UnusedResources">30 dana</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_7_days" tools:ignore="UnusedResources">1 tjedan</string>
 
     <!-- Inactive tabs auto-close message in the tabs tray -->
     <!-- The header text of the auto-close message when the user is asked if they want to turn on the auto-closing of inactive tabs. -->
@@ -1983,9 +2001,6 @@
     <string name="inactive_tabs_auto_close_message_snackbar">Automatsko zatvaranje omogućeno</string>
 
     <!-- Inactive tabs survey -->
-    <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_header" tools:ignore="UnusedResources">Pomozi nam da se poboljšamo</string>
-
     <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
     <string name="inactive_tabs_survey_header_1">Pomozi poboljšati Firefox</string>
 
@@ -1996,12 +2011,8 @@
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_do_it_myself">Želim samostalno očistiti stare kartice</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_long_option" tools:ignore="UnusedResources">Vrijeme do neaktivnosti je predugo</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_long_option_1">Razdoblje od dva tjedna je predugo</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_short_option" tools:ignore="UnusedResources">Vrijeme do neaktivnosti je prekratko</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_short_option_1">Razdoblje od dva tjedna je prekratko</string>
     <!-- Confirmation button text to submit the feedback for the inactive tabs survey. -->
     <string name="inactive_tabs_survey_send_button">Pošalji</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fc6b4c9f29..9b3eee2881 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -243,7 +243,7 @@
     <string name="browser_menu_edit">編集</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">ホームをカスタマイズ</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">ホームをカスタマイズ</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ホームページをカスタマイズ</string>
     <!-- Browser Toolbar -->
@@ -494,6 +494,10 @@
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">ホームページから離れることなく画像を繰り返し更新できます。</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Firefox ロゴ - 壁紙変更ボタンです</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">サポートされていないアドオンです</string>
@@ -1983,6 +1987,13 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">キャンセル</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">設定</string>
+    <!-- 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>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">休止中のタブ</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 639d8a72fa..a6666ca599 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -240,7 +240,7 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="browser_menu_edit">Ẓreg</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Sagen asebter agejdan</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Sagen asebter agejdan</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Sagen asebter agejdan</string>
     <!-- Browser Toolbar -->
@@ -493,6 +493,10 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Lqeḍ rnu leqqem tugna war ma teffɣeḍ seg usebtar agejdan.</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Alogo Firefox - beddel agilal, taqeffalt</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">Azegrir ur yettusefrak ara</string>
@@ -1979,6 +1983,13 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Sefsex</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Iɣewwaṛen</string>
+    <!-- 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">Wid yettbeddan fell-aɣ akked tudert-ik tabaḍnit</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <string name="top_sites_sponsored_label">S lmendad</string>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Accaren arurmiden</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 869b55318d..567c703d28 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -233,7 +233,7 @@
     <string name="browser_menu_edit">Түзету</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Үй бетін баптау</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Үй бетін баптау</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Үй бетін баптау</string>
     <!-- Browser Toolbar -->
@@ -480,6 +480,10 @@
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Негізгі беттен шықпай-ақ суретті айналдырыңыз және жаңартыңыз.</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Firefox логотипі - тұсқағазды, батырманы өзгерту</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">Қосымшаға қолдау жоқ</string>
@@ -1954,6 +1958,13 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Бас тарту</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Баптаулар</string>
+    <!-- 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>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Белсенді емес беттер</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index e15e207ffb..6f3a96c42b 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -236,7 +236,7 @@
     <string name="browser_menu_edit">Modificar</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Personalizar l’acuèlh</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Personalizar l’acuèlh</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar la pagina d’acuèlh</string>
     <!-- Browser Toolbar -->
@@ -487,6 +487,10 @@
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Alternatz e actualizatz l’imatge sens quitar la pagina d’acuèlh.</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Logotipe Firefox - cambiar lo fons d’ecran, boton</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">Lo modul complementari es pas pres en carga</string>
@@ -1990,6 +1994,13 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Anullar</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Paramètres</string>
+    <!-- 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">Nòstres esponsòrs e vòstra vida privada</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <string name="top_sites_sponsored_label">Esponsorizat</string>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Onglets inactius</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index cdf9088185..f50e4f5cbd 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -237,7 +237,7 @@
     <string name="browser_menu_edit">Editar</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Personalizar página principal</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Personalizar página principal</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Personalizar página inicial</string>
     <!-- Browser Toolbar -->
@@ -484,6 +484,10 @@
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Percorra e atualize a imagem sem sair da página principal.</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Logótipo do Firefox - altere o fundo, botão</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">O extra não é suportado</string>
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index e77031e4af..e67772d37d 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -233,7 +233,7 @@
     <string name="browser_menu_edit">Modifitgar</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Persunalisar la pagina da partenza</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Persunalisar la pagina da partenza</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Persunalisar la pagina da partenza</string>
     <!-- Browser Toolbar -->
@@ -481,6 +481,10 @@
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Percurrer ed actualisar il maletg senza bandunar la pagina da partenza.</string>
 
+    <!-- This is the accessibility content description for the wallpapers functionality. Users are
+    able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
+    <string name="wallpaper_logo_content_description">Logo da Firefox – midar il maletg dal fund davos, buttun</string>
+
     <!-- Add-on Installation from AMO-->
     <!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
     <string name="addon_not_supported_error">Il supplement na vegn betg sustegnì</string>
@@ -1963,6 +1967,13 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">Interrumper</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">Parameters</string>
+    <!-- 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">Noss sponsurs &amp; tia sfera privata</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <string name="top_sites_sponsored_label">Sponsurisà</string>
+
     <!-- Inactive tabs in the tabs tray -->
     <!-- Title text displayed in the tabs tray when a tab has been unused for 14 days. -->
     <string name="inactive_tabs_title">Tabs inactivs</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 95f13cc9d7..8c4ffa9995 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -247,7 +247,7 @@
     <!-- Browser menu button that opens the Customize menu -->
     <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">Персонализация</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
-    <string name="browser_menu_customize_home_1">Настроить домашнюю страницу</string>
+    <string name="browser_menu_customize_home_1">Изменить вид</string>
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Домашний экран</string>
@@ -491,7 +491,7 @@
     <!-- Snackbar label for action to view selected wallpaper -->
     <string name="wallpaper_updated_snackbar_action">Просмотр</string>
     <!-- Label for switch which toggles the "tap-to-switch" behavior on home screen logo -->
-    <string name="wallpaper_tap_to_change_switch_label">Для смены обоев коснитесь логотипа</string>
+    <string name="wallpaper_tap_to_change_switch_label">Смена обоев касанием по логотипу</string>
     <!-- Description for switch which toggles the "tap-to-switch" behavior on home screen logo -->
     <string name="wallpaper_tap_to_change_switch_description">Просматривайте и меняйте обои прямо с домашней страницы.</string>
     <!-- This is the accessibility content description for the wallpapers functionality. Users are
@@ -715,7 +715,7 @@
     <!-- Option for search term tab groups -->
     <string name="tab_view_search_term_tab_groups">Поисковые группы</string>
     <!-- Summary text for search term tab groups -->
-    <string name="tab_view_search_term_tab_groups_summary">Группируйте связанные сайты</string>
+    <string name="tab_view_search_term_tab_groups_summary">Группировать связанные сайты</string>
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
     <string name="preferences_close_tabs">Закрывать вкладки</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index dbcebf4407..d2e3c4746e 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -21,9 +21,7 @@
     <string name="no_private_tabs_description">แท็บส่วนตัวของคุณจะถูกแสดงที่นี่</string>
 
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
-    <string name="open_tab_tray_single">1 แท็บที่เปิด แตะเพื่อสลับไปยังแท็บ</string>
-    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
-    <string moz:removedIn="95" name="open_tab_tray_plural" tools:ignore="UnusedResources">%1$s แท็บที่เปิด แตะเพื่อสลับไปยังแท็บ</string>
+    <string moz:removedIn="96" name="open_tab_tray_single" tools:ignore="UnusedResources">1 แท็บที่เปิด แตะเพื่อสลับไปยังแท็บ</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>
@@ -38,22 +36,18 @@
     <!-- Content description for save to collection button while in multiselect mode in tab tray -->
     <string name="tab_tray_collection_button_multiselect_content_description">บันทึกแท็บที่เลือกลงในชุดสะสม</string>
     <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
-    <string name="tab_tray_item_selected_multiselect_content_description">เลือกแล้ว %1$s</string>
+    <string moz:removedIn="96" name="tab_tray_item_selected_multiselect_content_description" tools:ignore="UnusedResources">เลือกแล้ว %1$s</string>
     <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
-    <string name="tab_tray_item_unselected_multiselect_content_description">เลิกเลือกแล้ว %1$s</string>
+    <string moz:removedIn="96" name="tab_tray_item_unselected_multiselect_content_description" tools:ignore="UnusedResources">เลิกเลือกแล้ว %1$s</string>
     <!-- Content description announcement when exiting multiselect mode in tab tray -->
-    <string name="tab_tray_exit_multiselect_content_description">ออกจากโหมดเลือกหลายรายการแล้ว</string>
+    <string moz:removedIn="96" name="tab_tray_exit_multiselect_content_description" tools:ignore="UnusedResources">ออกจากโหมดเลือกหลายรายการแล้ว</string>
     <!-- Content description announcement when entering multiselect mode in tab tray -->
-    <string name="tab_tray_enter_multiselect_content_description">เข้าสู่โหมดเลือกหลายรายการแล้ว เลือกแท็บที่จะบันทึกลงในชุดสะสม</string>
+    <string moz:removedIn="96" name="tab_tray_enter_multiselect_content_description" tools:ignore="UnusedResources">เข้าสู่โหมดเลือกหลายรายการแล้ว เลือกแท็บที่จะบันทึกลงในชุดสะสม</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 moz:removedIn="94" name="recently_saved_bookmarks" tools:ignore="UnusedResources">บันทึกไว้ล่าสุด</string>
-    <!-- Title for the home screen section with recently saved bookmarks. -->
-    <string moz:removedIn="94" name="recently_bookmarked" tools:ignore="UnusedResources">ที่คั่นหน้าที่เพิ่มล่าสุด</string>
-    <!-- Title for the home screen section with recently saved bookmarks. -->
     <string name="recent_bookmarks_title">ที่คั่นหน้าล่าสุด</string>
     <!-- Content description for the recently saved bookmarks section on the home screen. -->
     <string name="recently_saved_bookmarks_content_description">ที่คั่นหน้าที่บันทึกไว้ล่าสุด</string>
@@ -61,21 +55,21 @@
     <string name="recently_saved_show_all">แสดงหมด</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">แสดงปุ่มที่คั่นหน้าทั้งหมดที่บันทึกไว้</string>
+    <string moz:removedIn="97" name="recently_saved_show_all_content_description" tools:ignore="UnusedResources">แสดงปุ่มที่คั่นหน้าทั้งหมดที่บันทึกไว้</string>
 
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s ผลิตขึ้นโดย Mozilla</string>
 
     <!-- Private Browsing -->
     <!-- Title for private session option -->
-    <string name="private_browsing_title">คุณอยู่ในวาระส่วนตัว</string>
+    <string moz:removedIn="96" name="private_browsing_title" tools:ignore="UnusedResources">คุณอยู่ในวาระส่วนตัว</string>
 
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="private_browsing_placeholder_description_2">%1$s จะล้างประวัติการค้นหาและประวัติการเรียกดูของคุณจากแท็บส่วนตัวเมื่อคุณปิดแท็บเหล่านั้นหรือออกจากแอป แม้ว่าสิ่งนี้จะไม่ทำให้คุณไม่เปิดเผยตัวตนกับเว็บไซต์หรือผู้ให้บริการอินเทอร์เน็ตของคุณ แต่จะทำให้การรักษาความเป็นส่วนตัวของสิ่งที่คุณทำออนไลน์จากผู้อื่นที่ใช้อุปกรณ์เครื่องนี้ง่ายขึ้น</string>
     <string name="private_browsing_common_myths">ความเข้าใจผิดที่พบบ่อยเกี่ยวกับการท่องเว็บแบบส่วนตัว</string>
     <!-- Delete session button to erase your history in a private session -->
-    <string name="private_browsing_delete_session">ลบวาระ</string>
+    <string moz:removedIn="96" name="private_browsing_delete_session" tools:ignore="UnusedResources">ลบวาระ</string>
 
     <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
     <!-- Text for the main message -->
@@ -119,9 +113,6 @@
     <string name="tab_tray_inactive_auto_close_button_content_description">ปิด</string>
 
 
-    <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
-    <string moz:removedIn="95" name="tab_tray_inactive_turn_on_auto_close_button" tools:ignore="UnusedResources">เปิดการปิดอัตโนมัติ</string>
-
     <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
     <string name="tab_tray_inactive_turn_on_auto_close_button_2">เปิดการปิดอัตโนมัติ</string>
 
@@ -132,9 +123,6 @@
     <!-- Shortcut action to open new private tab -->
     <string name="home_screen_shortcut_open_new_private_tab_2">แท็บส่วนตัวใหม่</string>
 
-    <!-- Heading for the Top Sites block -->
-    <string moz:removedIn="95" name="home_screen_top_sites_heading" tools:ignore="UnusedResources">ไซต์เด่น</string>
-
     <!-- Recent Tabs -->
     <!-- Header text for jumping back into the recent tab in the home screen -->
     <string name="recent_tabs_header">กลับเข้าไป</string>
@@ -142,35 +130,37 @@
     <string name="recent_tabs_show_all">แสดงหมด</string>
 
     <!-- Content description for the button which navigates the user to show all recent tabs in the tabs tray. -->
-    <string name="recent_tabs_show_all_content_description">แสดงปุ่มแท็บล่าสุดทั้งหมด</string>
+    <string moz:removedIn="97" name="recent_tabs_show_all_content_description2" tools:ignore="UnusedResources">แสดงแท็บล่าสุดทั้งหมด</string>
     <!-- Title for showing a group item in the 'Jump back in' section of the new tab
         The first parameter is the search term that the user used. (for example: your search for "cat")-->
     <string name="recent_tabs_search_term">การค้นหา \&quot;%1$s\&quot; ของคุณ</string>
     <!-- Text for the number of tabs in a group in the 'Jump back in' section of the new tab
-        The first parameter is the count for number of sites in the group.  This number will always be more than one. -->
-    <string name="recent_tabs_search_term_count">ไซต์: %1$s</string>
+    The first parameter is the count for number of sites in the group.  This number will always be more than one. -->
+    <string moz:removedIn="96" name="recent_tabs_search_term_count" tools:ignore="UnusedResources">ไซต์: %1$s</string>
+
+    <!-- Text for the number of tabs in a group in the 'Jump back in' section of the new tab
+        %d is a placeholder for the number of sites in the group. This number will always be more than one. -->
+    <string name="recent_tabs_search_term_count_2">%d เว็บไซต์</string>
 
     <!-- History Metadata -->
     <!-- Header text for a section on the home screen that displays grouped highlights from the
          user's browsing history, such as topics they have researched or explored on the web -->
-    <string moz:removedIn="94" name="history_metadata_header" tools:ignore="UnusedResources">การสำรวจที่ผ่านมา</string>
-
+    <string name="history_metadata_header_2">เยี่ยมชมล่าสุด</string>
     <!-- Header text for a section on the home screen that displays grouped highlights from the
          user's browsing history, such as topics they have researched or explored on the web -->
-    <string moz:removedIn="94" name="history_metadata_header_2" tools:ignore="UnusedResources">เยี่ยมชมล่าสุด</string>
-    <!-- Header text for a section on the home screen that displays grouped highlights from the
-         user's browsing history, such as topics they have researched or explored on the web -->
-    <string name="history_metadata_header_3">ผลค้นหาล่าสุด</string>
+    <string moz:removedIn="96" name="history_metadata_header_3" tools:ignore="UnusedResources">ผลค้นหาล่าสุด</string>
     <!-- Text for the menu button to remove a grouped highlight from the user's browsing history
          in the Recently visited section -->
     <string name="recently_visited_menu_item_remove">ลบ</string>
 
     <!-- Content description for the button which navigates the user to show all of their history. -->
-    <string name="past_explorations_show_all_content_description">แสดงปุ่มการสำรวจที่ผ่านมาทั้งหมด</string>
+    <string name="past_explorations_show_all_content_description_2">แสดงการสำรวจที่ผ่านมาทั้งหมด</string>
+    <!-- Content description for the button which navigates the user to show all of their history. -->
+    <string moz:removedIn="97" name="past_explorations_show_all_content_description" tools:ignore="UnusedResources">แสดงปุ่มการสำรวจที่ผ่านมาทั้งหมด</string>
 
     <!-- Browser Fragment -->
     <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
-    <string name="browser_tabs_button">แท็บที่เปิดอยู่</string>
+    <string moz:removedIn="96" name="browser_tabs_button" tools:ignore="UnusedResources">แท็บที่เปิดอยู่</string>
     <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
     <string name="browser_menu_back">ย้อนกลับ</string>
 
@@ -180,14 +170,12 @@
     <string name="browser_menu_refresh">เรียกใหม่</string>
     <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
     <string name="browser_menu_stop">หยุด</string>
-    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
-    <string moz:removedIn="95" name="browser_menu_bookmark" tools:ignore="UnusedResources">ที่คั่นหน้า</string>
     <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
-    <string name="browser_menu_edit_bookmark">แก้ไขที่คั่นหน้า</string>
+    <string moz:removedIn="96" name="browser_menu_edit_bookmark" tools:ignore="UnusedResources">แก้ไขที่คั่นหน้า</string>
     <!-- Browser menu button that opens the addon manager -->
     <string name="browser_menu_add_ons">ส่วนเสริม</string>
     <!-- Browser menu button that opens the addon extensions manager -->
-    <string name="browser_menu_extensions">ส่วนขยาย</string>
+    <string moz:removedIn="96" name="browser_menu_extensions" tools:ignore="UnusedResources">ส่วนขยาย</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 -->
@@ -211,13 +199,13 @@
     <!-- Browser menu button that opens the find in page menu -->
     <string name="browser_menu_find_in_page">ค้นหาในหน้า</string>
     <!-- Browser menu button that creates a private tab -->
-    <string name="browser_menu_private_tab">แท็บส่วนตัว</string>
+    <string moz:removedIn="96" name="browser_menu_private_tab" tools:ignore="UnusedResources">แท็บส่วนตัว</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">บันทึกไปยังชุดสะสม</string>
     <!-- Browser menu button that open a share menu to share the current site -->
     <string name="browser_menu_share">แบ่งปัน</string>
     <!-- Share menu title, displayed when a user is sharing their current site -->
-    <string name="menu_share_with">แบ่งปันด้วย…</string>
+    <string moz:removedIn="96" name="menu_share_with" tools:ignore="UnusedResources">แบ่งปันด้วย…</string>
     <!-- Browser menu button shown in custom tabs that opens the current tab in Fenix
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="browser_menu_open_in_fenix">เปิดใน %1$s</string>
@@ -234,7 +222,7 @@
     <!-- Browser menu button to open the current page in an external app -->
     <string name="browser_menu_open_app_link">เปิดในแอป</string>
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
-    <string name="browser_menu_read_appearance">ลักษณะที่ปรากฏ</string>
+    <string moz:removedIn="96" name="browser_menu_read_appearance" tools:ignore="UnusedResources">ลักษณะที่ปรากฏ</string>
 
     <!-- Browser menu button to show reader view appearance controls e.g. the used font type and size -->
     <string name="browser_menu_customize_reader_view">ปรับแต่งมุมมองผู้อ่าน</string>
@@ -244,7 +232,7 @@
     <string name="browser_menu_edit">แก้ไข</string>
 
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">ปรับแต่งหน้าแรก</string>
+    <string moz:removedIn="98" name="browser_menu_customize_home" tools:ignore="UnusedResources">ปรับแต่งหน้าแรก</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">ปรับแต่งหน้าแรก</string>
     <!-- Browser Toolbar -->
@@ -253,13 +241,13 @@
 
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
-    <string name="unknown_scheme_error_message">ไม่สามารถเชื่อมต่อได้เนื่องจากเป็นรูปแบบ URL ที่ไม่รู้จัก</string>
+    <string moz:removedIn="96" name="unknown_scheme_error_message" tools:ignore="UnusedResources">ไม่สามารถเชื่อมต่อได้เนื่องจากเป็นรูปแบบ URL ที่ไม่รู้จัก</string>
 
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">ภาษาที่เลือก</string>
     <!-- Content description for search icon -->
-    <string name="a11y_search_icon_content_description">ค้นหา</string>
+    <string moz:removedIn="96" name="a11y_search_icon_content_description" tools:ignore="UnusedResources">ค้นหา</string>
     <!-- Text for default locale item -->
     <string name="default_locale_text">ตามภาษาอุปกรณ์</string>
     <!-- Placeholder text shown in the search bar before a user enters text -->
@@ -273,7 +261,7 @@
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">การตั้งค่าเครื่องมือค้นหา</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_engines_search_with">คราวนี้ค้นหาด้วย:</string>
+    <string moz:removedIn="96" name="search_engines_search_with" tools:ignore="UnusedResources">คราวนี้ค้นหาด้วย:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">เติมลิงก์จากคลิปบอร์ด</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -331,7 +319,7 @@
     <!-- Title for the settings page-->
     <string name="settings">การตั้งค่า</string>
     <!-- Preference category for basic settings -->
-    <string name="preferences_category_basics">พื้นฐาน</string>
+    <string moz:removedIn="96" name="preferences_category_basics" tools:ignore="UnusedResources">พื้นฐาน</string>
     <!-- Preference category for general settings -->
     <string name="preferences_category_general">ทั่วไป</string>
     <!-- Preference category for all links about Fenix -->
@@ -343,26 +331,26 @@
     <!-- Preference for settings related to Search address bar -->
     <string name="preferences_search_address_bar">แถบที่อยู่</string>
     <!-- Preference linking to help about Fenix -->
-    <string name="preferences_help">ช่วยเหลือ</string>
+    <string moz:removedIn="96" name="preferences_help" tools:ignore="UnusedResources">ช่วยเหลือ</string>
     <!-- Preference link to rating Fenix on the Play Store -->
     <string name="preferences_rate">ให้คะแนนบน Google Play</string>
     <!-- Preference for giving feedback about Fenix -->
-    <string name="preferences_feedback">เสนอข้อคิดเห็น</string>
+    <string moz:removedIn="96" name="preferences_feedback" tools:ignore="UnusedResources">เสนอข้อคิดเห็น</string>
     <!-- Preference linking to about page for Fenix
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="preferences_about">เกี่ยวกับ %1$s</string>
     <!-- Preference linking to the your rights SUMO page -->
-    <string name="preferences_your_rights">สิทธิของคุณ</string>
+    <string moz:removedIn="96" name="preferences_your_rights" tools:ignore="UnusedResources">สิทธิของคุณ</string>
     <!-- Preference for settings related to saved passwords -->
-    <string name="preferences_passwords">รหัสผ่าน</string>
+    <string moz:removedIn="96" name="preferences_passwords" tools:ignore="UnusedResources">รหัสผ่าน</string>
     <!-- Preference for settings related to saved credit cards and addresses -->
-    <string name="preferences_credit_cards_addresses">บัตรเครดิตและที่อยู่</string>
+    <string moz:removedIn="96" name="preferences_credit_cards_addresses" tools:ignore="UnusedResources">บัตรเครดิตและที่อยู่</string>
     <!-- Preference for settings related to changing the default browser -->
     <string name="preferences_set_as_default_browser">ตั้งเป็นเบราว์เซอร์เริ่มต้น</string>
     <!-- Preference category for advanced settings -->
     <string name="preferences_category_advanced">ขั้นสูง</string>
     <!-- Preference category for privacy settings -->
-    <string name="preferences_category_privacy">ความเป็นส่วนตัว</string>
+    <string moz:removedIn="96" name="preferences_category_privacy" tools:ignore="UnusedResources">ความเป็นส่วนตัว</string>
     <!-- Preference category for privacy and security settings -->
     <string name="preferences_category_privacy_security">ความเป็นส่วนตัวและความปลอดภัย</string>
     <!-- Preference for advanced site permissions -->
@@ -389,14 +377,12 @@
     <!-- Preference category for account information -->
     <string name="preferences_category_account">บัญชี</string>
     <!-- Preference shown on banner to sign into account -->
-    <string name="preferences_sign_in">ลงชื่อเข้า</string>
+    <string moz:removedIn="96" name="preferences_sign_in" tools:ignore="UnusedResources">ลงชื่อเข้า</string>
     <!-- Preference for changing where the toolbar is positioned -->
     <string name="preferences_toolbar">แถบเครื่องมือ</string>
     <!-- Preference for changing default theme to dark or light mode -->
     <string name="preferences_theme">ชุดตกแต่ง</string>
     <!-- Preference for customizing the home screen -->
-    <string moz:removedIn="94" name="preferences_home" tools:ignore="UnusedResources">หน้าแรก</string>
-    <!-- Preference for customizing the home screen -->
     <string name="preferences_home_2">หน้าแรก</string>
     <!-- Preference for gestures based actions -->
     <string name="preferences_gestures">ท่าทาง</string>
@@ -415,9 +401,9 @@
     <!-- Preference for data collection -->
     <string name="preferences_data_collection">การเก็บรวบรวมข้อมูล</string>
     <!-- Preference linking to the privacy notice -->
-    <string name="preferences_privacy_link">ประกาศความเป็นส่วนตัว</string>
+    <string moz:removedIn="96" name="preferences_privacy_link" tools:ignore="UnusedResources">ประกาศความเป็นส่วนตัว</string>
     <!-- Preference category for developer tools -->
-    <string name="developer_tools_category">เครื่องมือนักพัฒนา</string>
+    <string moz:removedIn="96" name="developer_tools_category" tools:ignore="UnusedResources">เครื่องมือนักพัฒนา</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">การดีบั๊กระยะไกลผ่าน USB</string>
     <!-- Preference title for switch preference to show search engines -->
@@ -469,20 +455,27 @@
     <!-- Header text for jumping back into the recent tab in customize the home screen -->
     <string name="customize_toggle_jump_back_in">กลับเข้าไป</string>
     <!-- Title for the customize home screen section with recently saved bookmarks. -->
-    <string moz:removedIn="94" name="customize_toggle_recently_saved_bookmarks" tools:ignore="UnusedResources">บันทึกไว้ล่าสุด</string>
-    <!-- Title for the customize home screen section with recently saved bookmarks. -->
-    <string moz:removedIn="94" name="customize_toggle_recently_bookmarked" tools:ignore="UnusedResources">ที่คั่นหน้าที่เพิ่มล่าสุด</string>
-    <!-- Title for the customize home screen section with recently saved bookmarks. -->
     <string name="customize_toggle_recent_bookmarks">ที่คั่นหน้าล่าสุด</string>
     <!-- Title for the customize home screen section with recently visited. Recently visited is
     a section where users see a list of tabs that they have visited in the past few days -->
-    <string moz:removedIn="94" name="customize_toggle_recently_visited" tools:ignore="UnusedResources">เยี่ยมชมล่าสุด</string>
+    <string name="customize_toggle_recently_visited">เยี่ยมชมล่าสุด</string>
     <!-- Title for the customize home screen settings section for recent searches. Recent searches
      is a section where users see a list of groups of tabs that they have visited in the past few days -->
-    <string name="customize_toggle_recent_searches">ผลค้นหาล่าสุด</string>
+    <string moz:removedIn="96" name="customize_toggle_recent_searches" tools:ignore="UnusedResources">ผลค้นหาล่าสุด</string>
     <!-- Title for the customize home screen section with Pocket. -->
     <string name="customize_toggle_pocket">Pocket</string>
 
+    <!-- Title for the opening wallpaper settings screen -->
+    <string name="customize_wallpapers">รูปพื้นหลัง</string>
+
+    <!-- Wallpapers -->
+    <!-- Content description for various wallpapers. The first parameter is the name of the wallpaper -->
+    <string name="wallpapers_item_name_content_description">รายการรูปพื้นหลัง: %1$s</string>
+    <!-- Snackbar message for when wallpaper is selected -->
+    <string name="wallpaper_updated_snackbar_message">เปลี่ยนรูปพื้นหลังแล้ว!</string>
+    <!-- Snackbar label for action to view selected wallpaper -->
+    <string name="wallpaper_updated_snackbar_action">ดู</string>
+
     <!-- 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>
@@ -537,22 +530,22 @@
     <!--  The body for these is the URL of the tab received  -->
     <string name="fxa_tab_received_notification_name">แท็บที่ได้รับ</string>
     <!-- When multiple tabs have been received -->
-    <string name="fxa_tabs_received_notification_name">แท็บที่ได้รับ</string>
+    <string moz:removedIn="96" name="fxa_tabs_received_notification_name" tools:ignore="UnusedResources">แท็บที่ได้รับ</string>
     <!-- %s is the device name -->
     <string name="fxa_tab_received_from_notification_name">แท็บจาก %s</string>
 
     <!-- Advanced Preferences -->
     <!-- Preference for tracking protection settings -->
-    <string name="preferences_tracking_protection_settings">การป้องกันการติดตาม</string>
+    <string moz:removedIn="96" name="preferences_tracking_protection_settings" tools:ignore="UnusedResources">การป้องกันการติดตาม</string>
     <!-- Preference switch for tracking protection -->
-    <string name="preferences_tracking_protection">การป้องกันการติดตาม</string>
+    <string moz:removedIn="96" name="preferences_tracking_protection" tools:ignore="UnusedResources">การป้องกันการติดตาม</string>
 
     <!-- Preference switch description for tracking protection -->
-    <string name="preferences_tracking_protection_description">ปิดกั้นเนื้อหาและสคริปต์ที่ติดตามคุณออนไลน์</string>
+    <string moz:removedIn="96" name="preferences_tracking_protection_description" tools:ignore="UnusedResources">ปิดกั้นเนื้อหาและสคริปต์ที่ติดตามคุณออนไลน์</string>
     <!-- Preference for tracking protection exceptions -->
     <string name="preferences_tracking_protection_exceptions">ข้อยกเว้น</string>
     <!-- Preference description for tracking protection exceptions -->
-    <string name="preferences_tracking_protection_exceptions_description">การป้องกันการติดตามปิดอยู่สำหรับเว็บไซต์เหล่านี้</string>
+    <string moz:removedIn="96" name="preferences_tracking_protection_exceptions_description" tools:ignore="UnusedResources">การป้องกันการติดตามปิดอยู่สำหรับเว็บไซต์เหล่านี้</string>
     <!-- Button in Exceptions Preference to turn on tracking protection for all sites (remove all exceptions) -->
     <string name="preferences_tracking_protection_exceptions_turn_on_for_all">เปิดสำหรับไซต์ทั้งหมด</string>
     <!-- Text displayed when there are no exceptions -->
@@ -561,7 +554,7 @@
     <string name="exceptions_empty_message_learn_more_link">เรียนรู้เพิ่มเติม</string>
 
     <!-- Preference switch for Telemetry -->
-    <string name="preferences_telemetry">การวัดและส่งข้อมูลทางไกล</string>
+    <string moz:removedIn="96" name="preferences_telemetry" tools:ignore="UnusedResources">การวัดและส่งข้อมูลทางไกล</string>
     <!-- Preference switch for usage and technical data collection -->
     <string name="preference_usage_data">การใช้งานและข้อมูลทางเทคนิค</string>
     <!-- Preference description for usage and technical data collection -->
@@ -569,7 +562,7 @@
     <!-- Preference switch for marketing data collection -->
     <string name="preferences_marketing_data">ข้อมูลการตลาด</string>
     <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
-    <string name="preferences_marketing_data_description">แบ่งปันข้อมูลเกี่ยวกับคุณลักษณะที่คุณใช้ใน %1$s กับ Leanplum ผู้ให้บริการการตลาดมือถือของเรา</string>
+    <string moz:removedIn="96" name="preferences_marketing_data_description" tools:ignore="UnusedResources">แบ่งปันข้อมูลเกี่ยวกับคุณลักษณะที่คุณใช้ใน %1$s กับ Leanplum ผู้ให้บริการการตลาดมือถือของเรา</string>
     <!-- Preference description for marketing data collection -->
     <string name="preferences_marketing_data_description2">แบ่งปันข้อมูลการใช้งานพื้นฐานกับ Adjust ผู้จำหน่ายการตลาดมือถือของเรา</string>
     <!-- Title for studies preferences -->
@@ -577,23 +570,21 @@
     <!-- Summary for studies preferences -->
     <string name="preference_experiments_summary_2">อนุญาตให้ Mozilla ติดตั้งและเรียกใช้การศึกษา</string>
     <!-- Title for experiments preferences -->
-    <string name="preference_experiments">การทดลอง</string>
+    <string moz:removedIn="96" name="preference_experiments" tools:ignore="UnusedResources">การทดลอง</string>
     <!-- Summary for experiments preferences -->
-    <string name="preference_experiments_summary">อนุญาตให้ Mozilla ติดตั้งและเก็บรวบรวมข้อมูลสำหรับคุณลักษณะทดลอง</string>
+    <string moz:removedIn="96" name="preference_experiments_summary" tools:ignore="UnusedResources">อนุญาตให้ Mozilla ติดตั้งและเก็บรวบรวมข้อมูลสำหรับคุณลักษณะทดลอง</string>
     <!-- Preference switch for crash reporter -->
-    <string name="preferences_crash_reporter">ตัวรายงานข้อขัดข้อง</string>
+    <string moz:removedIn="96" name="preferences_crash_reporter" tools:ignore="UnusedResources">ตัวรายงานข้อขัดข้อง</string>
     <!-- Preference switch for Mozilla location service -->
-    <string name="preferences_mozilla_location_service">บริการตำแหน่งที่ตั้ง Mozilla</string>
+    <string moz:removedIn="96" name="preferences_mozilla_location_service" tools:ignore="UnusedResources">บริการตำแหน่งที่ตั้ง Mozilla</string>
     <!-- Preference switch for app health report. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="preferences_fenix_health_report">รายงานสุขภาพ %s</string>
+    <string moz:removedIn="96" name="preferences_fenix_health_report" tools:ignore="UnusedResources">รายงานสุขภาพ %s</string>
 
     <!-- Turn On Sync Preferences -->
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">เปิด Sync</string>
-    <!-- Preference for pairing -->
-    <string moz:removedIn="95" name="preferences_sync_pair" tools:ignore="UnusedResources">สแกนรหัสการจับคู่ใน Firefox เดสก์ท็อป</string>
     <!-- Preference for account login -->
-    <string name="preferences_sync_sign_in">ลงชื่อเข้า</string>
+    <string moz:removedIn="96" name="preferences_sync_sign_in" tools:ignore="UnusedResources">ลงชื่อเข้า</string>
     <!-- Preference for reconnecting to FxA sync -->
     <string name="preferences_sync_sign_in_to_reconnect">ลงชื่อเข้าเพื่อเชื่อมต่ออีกครั้ง</string>
     <!-- Preference for removing FxA account -->
@@ -603,9 +594,9 @@
     <!-- Instructions on how to access pairing -->
     <string name="pair_instructions_2"><![CDATA[สแกนรหัส QR ที่แสดงใน <b>firefox.com/pair</b>]]></string>
     <!-- Button to open camera for pairing -->
-    <string name="pair_open_camera">เปิดกล้อง</string>
+    <string moz:removedIn="96" name="pair_open_camera" tools:ignore="UnusedResources">เปิดกล้อง</string>
     <!-- Button to cancel pairing -->
-    <string name="pair_cancel">ยกเลิก</string>
+    <string moz:removedIn="96" name="pair_cancel" tools:ignore="UnusedResources">ยกเลิก</string>
 
     <!-- Toolbar Preferences -->
     <!-- Preference for using top toolbar -->
@@ -635,9 +626,9 @@
 
     <!-- Library -->
     <!-- Option in Library to open Sessions page -->
-    <string name="library_sessions">วาระ</string>
+    <string moz:removedIn="96" name="library_sessions" tools:ignore="UnusedResources">วาระ</string>
     <!-- Option in Library to open Screenshots page -->
-    <string name="library_screenshots">ภาพหน้าจอ</string>
+    <string moz:removedIn="96" name="library_screenshots" tools:ignore="UnusedResources">ภาพหน้าจอ</string>
     <!-- Option in Library to open Downloads page -->
     <string name="library_downloads">การดาวน์โหลด</string>
     <!-- Option in library to open Bookmarks page -->
@@ -655,15 +646,15 @@
     <!-- Option in Library to open a new tab -->
     <string name="library_new_tab">แท็บใหม่</string>
     <!-- Option in Library to find text in page -->
-    <string name="library_find_in_page">ค้นหาในหน้า</string>
+    <string moz:removedIn="96" name="library_find_in_page" tools:ignore="UnusedResources">ค้นหาในหน้า</string>
     <!-- Option in Library to open Reading List -->
-    <string name="library_reading_list">รายการอ่าน</string>
+    <string moz:removedIn="96" name="library_reading_list" tools:ignore="UnusedResources">รายการอ่าน</string>
     <!-- Menu Item Label for Search in Library -->
-    <string name="library_search">ค้นหา</string>
+    <string moz:removedIn="96" name="library_search" tools:ignore="UnusedResources">ค้นหา</string>
     <!-- Settings Page Title -->
     <string name="settings_title">การตั้งค่า</string>
     <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
-    <string name="content_description_history_menu">เมนูรายการประวัติ</string>
+    <string moz:removedIn="96" name="content_description_history_menu" tools:ignore="UnusedResources">เมนูรายการประวัติ</string>
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">ปิด</string>
 
@@ -715,20 +706,12 @@
     <string name="preference_auto_close_tabs" tools:ignore="UnusedResources">ปิดแท็บที่เปิดอยู่อัตโนมัติ</string>
 
     <!-- Opening screen -->
-    <!-- Title of a preference that allows a user to indicate after a specified amount of time when the app should start on the home screen -->
-    <string moz:removedIn="94" name="preferences_start_on_home" tools:ignore="UnusedResources">เริ่มที่หน้าแรก</string>
     <!-- Title of a preference that allows a user to choose what screen to show after opening the app -->
     <string name="preferences_opening_screen">หน้าจอเมื่อเปิด</string>
-    <!-- Option for starting on the home screen after after four hours or inactivity -->
-    <string moz:removedIn="94" name="start_on_home_after_four_hours" tools:ignore="UnusedResources">หลังจาก 4 ชั่วโมง</string>
     <!-- Option for always opening the homepage when re-opening the app -->
     <string name="opening_screen_homepage">หน้าแรก</string>
-    <!-- Option for always starting on the home screen -->
-    <string moz:removedIn="94" name="start_on_home_always" tools:ignore="UnusedResources">ทุกครั้ง</string>
     <!-- Option for always opening the user's last-open tab when re-opening the app -->
     <string name="opening_screen_last_tab">แท็บสุดท้าย</string>
-    <!-- Option for never starting on the home screen -->
-    <string moz:removedIn="94" name="start_on_home_never" tools:ignore="UnusedResources">ไม่เลย</string>
     <!-- Option for always opening the homepage when re-opening the app after four hours of inactivity -->
     <string name="opening_screen_after_four_hours_of_inactivity">หน้าแรกหลังจากไม่มีการใช้งานเป็นเวลา 4 ชั่วโมง</string>
     <!-- Summary for tabs preference when auto closing tabs setting is set to manual close-->
@@ -770,7 +753,7 @@
     <!-- Title for the list of tabs -->
     <string name="tab_header_label">แท็บที่เปิด</string>
     <!-- Title for the list of tabs in the current private session -->
-    <string name="tabs_header_private_title">วาระส่วนตัว</string>
+    <string moz:removedIn="96" name="tabs_header_private_title" tools:ignore="UnusedResources">วาระส่วนตัว</string>
     <!-- Title for the list of tabs in the current private session -->
     <string name="tabs_header_private_tabs_title">แท็บส่วนตัว</string>
     <!-- Title for the list of tabs in the synced tabs -->
@@ -784,11 +767,9 @@
     <!-- Text for the new tab button to indicate syncing command on the synced tabs page -->
     <string name="tab_drawer_fab_sync">ซิงค์</string>
     <!-- Text shown as the title of the open tab tray -->
-    <string name="tab_tray_title">แท็บที่เปิด</string>
+    <string moz:removedIn="96" name="tab_tray_title" tools:ignore="UnusedResources">แท็บที่เปิด</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
-    <string name="tab_tray_menu_item_save">บันทึกไปยังชุดสะสม</string>
-    <!-- Text shown in the menu for the collection selector -->
-    <string moz:removedIn="95" name="tab_tray_menu_select" tools:ignore="UnusedResources">เลือก</string>
+    <string moz:removedIn="96" name="tab_tray_menu_item_save" tools:ignore="UnusedResources">บันทึกไปยังชุดสะสม</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">แบ่งปันแท็บทั้งหมด</string>
     <!-- Text shown in the menu to view recently closed tabs -->
@@ -802,11 +783,11 @@
     <!-- Text shown in the menu for closing all tabs -->
     <string name="tab_tray_menu_item_close">ปิดแท็บทั้งหมด</string>
     <!-- Shortcut action to open new tab -->
-    <string name="tab_tray_menu_open_new_tab">แท็บใหม่</string>
+    <string moz:removedIn="96" name="tab_tray_menu_open_new_tab" tools:ignore="UnusedResources">แท็บใหม่</string>
     <!-- Shortcut action to open the home screen -->
-    <string name="tab_tray_menu_home">ไปยังหน้าแรก</string>
+    <string moz:removedIn="96" name="tab_tray_menu_home" tools:ignore="UnusedResources">ไปยังหน้าแรก</string>
     <!-- Shortcut action to toggle private mode -->
-    <string name="tab_tray_menu_toggle">สลับโหมดแท็บ</string>
+    <string moz:removedIn="96" name="tab_tray_menu_toggle" tools:ignore="UnusedResources">สลับโหมดแท็บ</string>
     <!-- Text shown in the multiselect menu for bookmarking selected tabs. -->
     <string name="tab_tray_multiselect_menu_item_bookmark">ที่คั่นหน้า</string>
     <!-- Text shown in the multiselect menu for closing selected tabs. -->
@@ -826,26 +807,26 @@
     <!-- Content description (not visible, for screen readers etc.): Opens the open tabs menu when pressed -->
     <string name="open_tabs_menu">เปิดเมนูแท็บ</string>
     <!-- Open tabs menu item to close all tabs -->
-    <string name="tabs_menu_close_all_tabs">ปิดแท็บทั้งหมด</string>
+    <string moz:removedIn="96" name="tabs_menu_close_all_tabs" tools:ignore="UnusedResources">ปิดแท็บทั้งหมด</string>
     <!-- Open tabs menu item to share all tabs -->
-    <string name="tabs_menu_share_tabs">แบ่งปันแท็บ</string>
+    <string moz:removedIn="96" name="tabs_menu_share_tabs" tools:ignore="UnusedResources">แบ่งปันแท็บ</string>
     <!-- Open tabs menu item to save tabs to collection -->
     <string name="tabs_menu_save_to_collection1">บันทึกแท็บไปยังชุดสะสม</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
     <string name="tab_menu">เมนูแท็บ</string>
     <!-- Tab menu item to share the tab -->
-    <string name="tab_share">แบ่งปันแท็บ</string>
+    <string moz:removedIn="96" name="tab_share" tools:ignore="UnusedResources">แบ่งปันแท็บ</string>
 
     <!-- Button in the current session menu. Deletes the session when pressed -->
-    <string name="current_session_delete">ลบ</string>
+    <string moz:removedIn="96" name="current_session_delete" tools:ignore="UnusedResources">ลบ</string>
     <!-- Button in the current session menu. Saves the session when pressed -->
-    <string name="current_session_save">บันทึก</string>
+    <string moz:removedIn="96" name="current_session_save" tools:ignore="UnusedResources">บันทึก</string>
     <!-- Button in the current session menu. Opens the share menu when pressed -->
-    <string name="current_session_share">แบ่งปัน</string>
+    <string moz:removedIn="96" name="current_session_share" tools:ignore="UnusedResources">แบ่งปัน</string>
     <!-- Content description (not visible, for screen readers etc.): Title icon for current session menu -->
-    <string name="current_session_image">ภาพวาระปัจจุบัน</string>
+    <string moz:removedIn="96" name="current_session_image" tools:ignore="UnusedResources">ภาพวาระปัจจุบัน</string>
     <!-- Button to save the current set of tabs into a collection -->
-    <string name="save_to_collection">บันทึกไปยังชุดสะสม</string>
+    <string moz:removedIn="96" name="save_to_collection" tools:ignore="UnusedResources">บันทึกไปยังชุดสะสม</string>
     <!-- Text for the menu button to delete a collection -->
     <string name="collection_delete">ลบชุดสะสม</string>
     <!-- Text for the menu button to rename a collection -->
@@ -866,10 +847,7 @@
     <string name="pwa_site_controls_title_private">%1$s (โหมดส่วนตัว)</string>
 
     <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
-    <string name="tab_tray_save_to_collection">บันทึก</string>
-
-    <!-- Title text for the normal tabs header in the tabs tray which are not part of any tab grouping. -->
-    <string moz:removedIn="94" name="tab_tray_header_title" tools:ignore="UnusedResources">อื่น ๆ</string>
+    <string moz:removedIn="96" name="tab_tray_save_to_collection" tools:ignore="UnusedResources">บันทึก</string>
 
     <!-- Title text for the normal tabs header in the tabs tray which are not part of any tab grouping. -->
     <string name="tab_tray_header_title_1">แท็บอื่น ๆ</string>
@@ -878,35 +856,27 @@
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">ลบประวัติ</string>
     <!-- Text for the dialog to confirm clearing all history -->
-    <string name="history_delete_all_dialog">คุณแน่ใจหรือไม่ว่าต้องการล้างประวัติของคุณ?</string>
+    <string moz:removedIn="96" name="history_delete_all_dialog" tools:ignore="UnusedResources">คุณแน่ใจหรือไม่ว่าต้องการล้างประวัติของคุณ?</string>
     <!-- Text for the snackbar to confirm that multiple browsing history items has been deleted -->
     <string name="history_delete_multiple_items_snackbar">ลบประวัติแล้ว</string>
     <!-- Text for the snackbar to confirm that a single browsing history item has been deleted. The first parameter is the shortened URL of the deleted history item. -->
     <string name="history_delete_single_item_snackbar">ลบ %1$s แล้ว</string>
     <!-- Text for positive action to delete history in deleting history dialog -->
-    <string name="history_clear_dialog">ล้าง</string>
-    <!-- History overflow menu copy button -->
-    <string moz:removedIn="94" name="history_menu_copy_button" tools:ignore="UnusedResources">คัดลอก</string>
-    <!-- History overflow menu share button -->
-    <string moz:removedIn="94" name="history_menu_share_button" tools:ignore="UnusedResources">แบ่งปัน</string>
-    <!-- History overflow menu open in new tab button -->
-    <string moz:removedIn="94" name="history_menu_open_in_new_tab_button" tools:ignore="UnusedResources">เปิดในแท็บใหม่</string>
-    <!-- History overflow menu open in private tab button -->
-    <string moz:removedIn="94" name="history_menu_open_in_private_tab_button" tools:ignore="UnusedResources">เปิดในแท็บส่วนตัว</string>
-    <!-- Text for the button to delete a single history item -->
-    <string moz:removedIn="94" name="history_delete_item" tools:ignore="UnusedResources">ลบ</string>
+    <string moz:removedIn="96" name="history_clear_dialog" tools:ignore="UnusedResources">ล้าง</string>
+    <!-- Context description text for the button to delete a single history item -->
+    <string name="history_delete_item">ลบ</string>
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
     <string name="history_multi_select_title">เลือกอยู่ %1$d</string>
     <!-- Text for the button to clear selected history items. The first parameter
         is a digit showing the number of items you have selected -->
-    <string name="history_delete_some">ลบ %1$d รายการ</string>
+    <string moz:removedIn="96" name="history_delete_some" tools:ignore="UnusedResources">ลบ %1$d รายการ</string>
     <!-- Text for the header that groups the history for today -->
     <string name="history_today">วันนี้</string>
     <!-- Text for the header that groups the history for yesterday -->
     <string name="history_yesterday">เมื่อวาน</string>
     <!-- Text for the header that groups the history for last 24 hours -->
-    <string name="history_24_hours">24 ชั่วโมงที่ผ่านมา</string>
+    <string moz:removedIn="96" name="history_24_hours" tools:ignore="UnusedResources">24 ชั่วโมงที่ผ่านมา</string>
     <!-- Text for the header that groups the history the past 7 days -->
     <string name="history_7_days">7 วันที่ผ่านมา</string>
     <!-- Text for the header that groups the history the past 30 days -->
@@ -928,7 +898,7 @@
     <string name="download_multi_select_title">เลือกอยู่ %1$d</string>
 
     <!-- History overflow menu open in new tab button -->
-    <string name="download_menu_open">เปิด</string>
+    <string moz:removedIn="96" name="download_menu_open" tools:ignore="UnusedResources">เปิด</string>
 
 
     <!-- Text for the button to remove a single download item -->
@@ -939,7 +909,7 @@
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title_2">ขออภัย %1$s ไม่สามารถโหลดหน้านั้นได้</string>
     <!-- Description text displayed on the tab crash page -->
-    <string name="tab_crash_description">คุณสามารถพยายามกู้คืนหรือปิดแท็บนี้ได้จากด้านล่าง</string>
+    <string moz:removedIn="96" name="tab_crash_description" tools:ignore="UnusedResources">คุณสามารถพยายามกู้คืนหรือปิดแท็บนี้ได้จากด้านล่าง</string>
     <!-- Send crash report checkbox text on the tab crash page -->
     <string name="tab_crash_send_report">ส่งรายงานข้อขัดข้องไปยัง Mozilla</string>
     <!-- Close tab button text on the tab crash page -->
@@ -948,24 +918,22 @@
     <string name="tab_crash_restore">เรียกคืนแท็บ</string>
 
     <!-- Content Description for session item menu button -->
-    <string name="content_description_session_menu">ตัวเลือกวาระ</string>
+    <string moz:removedIn="96" name="content_description_session_menu" tools:ignore="UnusedResources">ตัวเลือกวาระ</string>
 
     <!-- Content Description for session item share button -->
-    <string name="content_description_session_share">แบ่งปันวาระ</string>
+    <string moz:removedIn="96" name="content_description_session_share" tools:ignore="UnusedResources">แบ่งปันวาระ</string>
 
     <!-- Bookmarks -->
     <!-- Content description for bookmarks library menu -->
-    <string name="bookmark_menu_content_description">เมนูที่คั่นหน้า</string>
-    <!-- Screen title for editing bookmarks -->
-    <string moz:removedIn="95" name="bookmark_edit" tools:ignore="UnusedResources">แก้ไขที่คั่นหน้า</string>
+    <string moz:removedIn="96" name="bookmark_menu_content_description" tools:ignore="UnusedResources">เมนูที่คั่นหน้า</string>
     <!-- Screen title for selecting a bookmarks folder -->
-    <string name="bookmark_select_folder">เลือกโฟลเดอร์</string>
+    <string moz:removedIn="96" name="bookmark_select_folder" tools:ignore="UnusedResources">เลือกโฟลเดอร์</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">คุณแน่ใจหรือไม่ว่าต้องการลบโฟลเดอร์นี้?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
     <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s จะลบรายการที่เลือก</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
-    <string name="bookmark_delete_folder_snackbar">ลบ %1$s แล้ว</string>
+    <string moz:removedIn="96" name="bookmark_delete_folder_snackbar" tools:ignore="UnusedResources">ลบ %1$s แล้ว</string>
     <!-- Screen title for adding a bookmarks folder -->
     <string name="bookmark_add_folder">เพิ่มโฟลเดอร์</string>
     <!-- Snackbar title shown after a bookmark has been created. -->
@@ -975,7 +943,7 @@
     <!-- Bookmark overflow menu edit button -->
     <string name="bookmark_menu_edit_button">แก้ไข</string>
     <!-- Bookmark overflow menu select button -->
-    <string name="bookmark_menu_select_button">เลือก</string>
+    <string moz:removedIn="96" name="bookmark_menu_select_button" tools:ignore="UnusedResources">เลือก</string>
     <!-- Bookmark overflow menu copy button -->
     <string name="bookmark_menu_copy_button">คัดลอก</string>
     <!-- Bookmark overflow menu share button -->
@@ -1025,7 +993,7 @@
 
     <!-- Site Permissions -->
     <!-- Site permissions preferences header -->
-    <string name="permissions_header">สิทธิอนุญาต</string>
+    <string moz:removedIn="96" name="permissions_header" tools:ignore="UnusedResources">สิทธิอนุญาต</string>
     <!-- Button label that take the user to the Android App setting -->
     <string name="phone_feature_go_to_settings">ไปยังการตั้งค่า</string>
     <!-- Content description (not visible, for screen readers etc.): Quick settings sheet
@@ -1035,7 +1003,7 @@
     <!-- Label that indicates that this option it the recommended one -->
     <string name="phone_feature_recommended">แนะนำ</string>
     <!-- button that allows editing site permissions settings -->
-    <string name="quick_settings_sheet_manage_site_permissions">จัดการสิทธิอนุญาตไซต์</string>
+    <string moz:removedIn="96" name="quick_settings_sheet_manage_site_permissions" tools:ignore="UnusedResources">จัดการสิทธิอนุญาตไซต์</string>
     <!-- Button label for clearing all the information of site permissions-->
     <string name="clear_permissions">ล้างสิทธิอนุญาต</string>
     <!-- Button label for clearing a site permission-->
@@ -1142,14 +1110,14 @@
 
     <!-- Share -->
     <!-- Share screen header -->
-    <string name="share_header">ส่งและแบ่งปัน</string>
+    <string moz:removedIn="96" name="share_header" tools:ignore="UnusedResources">ส่งและแบ่งปัน</string>
     <!-- Share screen header -->
     <string name="share_header_2">แบ่งปัน</string>
     <!-- Content description (not visible, for screen readers etc.):
         "Share" button. Opens the share menu when pressed. -->
     <string name="share_button_content_description">แบ่งปัน</string>
     <!-- Sub-header in the dialog to share a link to another app -->
-    <string name="share_link_subheader">แบ่งปันลิงก์</string>
+    <string moz:removedIn="96" name="share_link_subheader" tools:ignore="UnusedResources">แบ่งปันลิงก์</string>
     <!-- Sub-header in the dialog to share a link to another sync device -->
     <string name="share_device_subheader">ส่งไปยังอุปกรณ์</string>
     <!-- Sub-header in the dialog to share a link to an app from the full list -->
@@ -1185,17 +1153,17 @@
 
     <!-- Notifications -->
     <!-- The user visible name of the "notification channel" (Android 8+ feature) for the ongoing notification shown while a browsing session is active. -->
-    <string name="notification_pbm_channel_name">วาระการเรียกดูแบบส่วนตัว</string>
+    <string moz:removedIn="96" name="notification_pbm_channel_name" tools:ignore="UnusedResources">วาระการเรียกดูแบบส่วนตัว</string>
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
-    <string name="notification_pbm_delete_text">ลบแท็บส่วนตัว</string>
+    <string moz:removedIn="96" name="notification_pbm_delete_text" tools:ignore="UnusedResources">ลบแท็บส่วนตัว</string>
     <!-- Text shown in the notification that pops up to remind the user that a private browsing session is active. -->
     <string name="notification_pbm_delete_text_2">ปิดแท็บส่วนตัว</string>
     <!-- Notification action to open Fenix and resume the current browsing session. -->
-    <string name="notification_pbm_action_open">เปิด</string>
+    <string moz:removedIn="96" name="notification_pbm_action_open" tools:ignore="UnusedResources">เปิด</string>
     <!-- Notification action to delete all current private browsing sessions AND switch to Fenix (bring it to the foreground) -->
-    <string name="notification_pbm_action_delete_and_open">ลบและเปิด</string>
+    <string moz:removedIn="96" name="notification_pbm_action_delete_and_open" tools:ignore="UnusedResources">ลบและเปิด</string>
     <!-- Name of the "Powered by Fenix" notification channel. Displayed in the "App notifications" system settings for the app -->
-    <string name="notification_powered_by_channel_name">ขับเคลื่อนโดย</string>
+    <string moz:removedIn="96" name="notification_powered_by_channel_name" tools:ignore="UnusedResources">ขับเคลื่อนโดย</string>
     <!-- Name of the marketing notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_marketing_channel_name">การตลาด</string>
     <!-- Title shown in the notification that pops up to remind the user to set fenix as default browser.
@@ -1211,19 +1179,19 @@
     <!-- Text shown in snackbar when user renames a collection -->
     <string name="snackbar_collection_renamed">เปลี่ยนชื่อชุดสะสมแล้ว</string>
     <!-- Text shown in snackbar when user deletes a tab -->
-    <string name="snackbar_tab_deleted">ลบแท็บแล้ว</string>
+    <string moz:removedIn="96" name="snackbar_tab_deleted" tools:ignore="UnusedResources">ลบแท็บแล้ว</string>
     <!-- Text shown in snackbar when user deletes all tabs -->
-    <string name="snackbar_tabs_deleted">ลบแท็บแล้ว</string>
+    <string moz:removedIn="96" name="snackbar_tabs_deleted" tools:ignore="UnusedResources">ลบแท็บแล้ว</string>
     <!-- Text shown in snackbar when user closes a tab -->
     <string name="snackbar_tab_closed">ปิดแท็บแล้ว</string>
     <!-- Text shown in snackbar when user closes all tabs -->
     <string name="snackbar_tabs_closed">ปิดแท็บแล้ว</string>
     <!-- Text shown in snackbar when user closes tabs -->
-    <string name="snackbar_message_tabs_closed">ปิดแท็บแล้ว!</string>
+    <string moz:removedIn="96" name="snackbar_message_tabs_closed" tools:ignore="UnusedResources">ปิดแท็บแล้ว!</string>
     <!-- Text shown in snackbar when user bookmarks a list of tabs -->
     <string name="snackbar_message_bookmarks_saved">บันทึกที่คั่นหน้าแล้ว!</string>
     <!-- Text shown in snackbar action for viewing bookmarks -->
-    <string name="snackbar_message_bookmarks_view">ดู</string>
+    <string moz:removedIn="96" name="snackbar_message_bookmarks_view" tools:ignore="UnusedResources">ดู</string>
     <!-- Text shown in snackbar when user adds a site to top sites -->
     <string name="snackbar_added_to_top_sites">เพิ่มไปยังไซต์เด่นแล้ว!</string>
     <!-- Text shown in snackbar when user closes a private tab -->
@@ -1231,15 +1199,15 @@
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">ปิดแท็บส่วนตัวแล้ว</string>
     <!-- Text shown in snackbar when user deletes all private tabs -->
-    <string name="snackbar_private_tabs_deleted">ลบแท็บส่วนตัวแล้ว</string>
+    <string moz:removedIn="96" name="snackbar_private_tabs_deleted" tools:ignore="UnusedResources">ลบแท็บส่วนตัวแล้ว</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 -->
     <string name="snackbar_top_site_removed">เอาไซต์ออกแล้ว</string>
     <!-- Text for action to undo deleting a tab or collection shown in a11y dialog -->
-    <string name="a11y_dialog_deleted_undo">เลิกทำ</string>
+    <string moz:removedIn="96" name="a11y_dialog_deleted_undo" tools:ignore="UnusedResources">เลิกทำ</string>
     <!-- Text for action to confirm deleting a tab or collection shown in a11y dialog -->
-    <string name="a11y_dialog_deleted_confirm">ยืนยัน</string>
+    <string moz:removedIn="96" name="a11y_dialog_deleted_confirm" tools:ignore="UnusedResources">ยืนยัน</string>
     <!-- QR code scanner prompt which appears after scanning a code, but before navigating to it
         First parameter is the name of the app, second parameter is the URL or text scanned-->
     <string name="qr_scanner_confirmation_dialog_message">อนุญาตให้ %1$s เปิด %2$s</string>
@@ -1259,8 +1227,6 @@
     <string name="delete_tab_and_collection_dialog_title">ลบ %1$s หรือไม่?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">ลบ</string>
-    <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
-    <string moz:removedIn="93" name="tab_collection_dialog_negative" tools:ignore="UnusedResources">ยกเลิก</string>
     <!-- Text displayed in a notification when the user enters full screen mode -->
     <string name="full_screen_notification">เข้าสู่โหมดเต็มหน้าจอ</string>
     <!-- Message for copying the URL via long press on the toolbar -->
@@ -1290,10 +1256,10 @@
         number of history items the user has -->
     <string name="preferences_delete_browsing_data_browsing_data_subtitle">%d ที่อยู่</string>
     <!-- Title for history items in Delete browsing data -->
-    <string name="preferences_delete_browsing_data_browsing_history_title">ประวัติ</string>
+    <string moz:removedIn="96" name="preferences_delete_browsing_data_browsing_history_title" tools:ignore="UnusedResources">ประวัติ</string>
     <!-- Subtitle for the history items in delete browsing data, parameter will be replaced with the
         number of history pages the user has -->
-    <string name="preferences_delete_browsing_data_browsing_history_subtitle">%d หน้า</string>
+    <string moz:removedIn="96" name="preferences_delete_browsing_data_browsing_history_subtitle" tools:ignore="UnusedResources">%d หน้า</string>
     <!-- Title for the cookies item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cookies">คุกกี้</string>
     <!-- Subtitle for the cookies item in Delete browsing data -->
@@ -1311,7 +1277,7 @@
     <!-- Title for the Delete browsing data on quit preference -->
     <string name="preferences_delete_browsing_data_on_quit">ลบข้อมูลการเรียกดูเมื่อออก</string>
     <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
-    <string name="preference_summary_delete_browsing_data_on_quit">ลบข้อมูลการเรียกดูโดยอัตโนมัติเมื่อคุณเลือก &quot;ออก&quot; จากเมนูหลัก</string>
+    <string moz:removedIn="96" name="preference_summary_delete_browsing_data_on_quit" tools:ignore="UnusedResources">ลบข้อมูลการเรียกดูโดยอัตโนมัติเมื่อคุณเลือก &quot;ออก&quot; จากเมนูหลัก</string>
     <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
     <string name="preference_summary_delete_browsing_data_on_quit_2">ลบข้อมูลการเรียกดูโดยอัตโนมัติเมื่อคุณเลือก \&quot;ออก\&quot; จากเมนูหลัก</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
@@ -1362,14 +1328,7 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_header">ยินดีต้อนรับสู่ %s!</string>
     <!-- text for the Firefox Accounts section header -->
-    <string name="onboarding_fxa_section_header">มีบัญชีอยู่แล้ว?</string>
-    <!-- text for the "What's New" onboarding card header -->
-    <string moz:removedIn="94" name="onboarding_whats_new_header1" tools:ignore="UnusedResources">ดูว่ามีอะไรใหม่</string>
-    <!-- text for the "what's new" onboarding card description
-    The first parameter is the short name of the app (e.g. Firefox) -->
-    <string moz:removedIn="94" name="onboarding_whats_new_description" tools:ignore="UnusedResources">มีคำถามเกี่ยวกับ %s ที่ออกแบบใหม่หรือไม่? ต้องการรู้ว่ามีอะไรเปลี่ยนไปบ้างหรือไม่?</string>
-    <!-- text for underlined clickable link that is part of "what's new" onboarding card description that links to an FAQ -->
-    <string moz:removedIn="94" name="onboarding_whats_new_description_linktext" tools:ignore="UnusedResources">พบคำตอบได้ที่นี่</string>
+    <string moz:removedIn="96" name="onboarding_fxa_section_header" tools:ignore="UnusedResources">มีบัญชีอยู่แล้ว?</string>
     <!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
     <string name="onboarding_account_sign_in_header_1">ซิงค์ Firefox ระหว่างอุปกรณ์</string>
     <!-- Text for the button to learn more about signing in to your Firefox account -->
@@ -1377,19 +1336,19 @@
     <!-- text for the firefox account onboarding card header when we detect you're already signed in to
         another Firefox browser. (The word `Firefox` should not be translated)
         The first parameter is the email of the detected user's account -->
-    <string name="onboarding_firefox_account_auto_signin_header_3">คุณลงชื่อเข้าในชื่อ %s บนเบราว์เซอร์ Firefox อื่นบนอุปกรณ์นี้ คุณต้องการลงชื่อเข้าด้วยบัญชีนี้หรือไม่?</string>
+    <string moz:removedIn="96" name="onboarding_firefox_account_auto_signin_header_3" tools:ignore="UnusedResources">คุณลงชื่อเข้าในชื่อ %s บนเบราว์เซอร์ Firefox อื่นบนอุปกรณ์นี้ คุณต้องการลงชื่อเข้าด้วยบัญชีนี้หรือไม่?</string>
     <!-- text for the button to confirm automatic sign-in -->
-    <string name="onboarding_firefox_account_auto_signin_confirm">ใช่ ให้ฉันลงชื่อเข้า</string>
+    <string moz:removedIn="96" name="onboarding_firefox_account_auto_signin_confirm" tools:ignore="UnusedResources">ใช่ ให้ฉันลงชื่อเข้า</string>
     <!-- text for the automatic sign-in button while signing in is in process -->
-    <string name="onboarding_firefox_account_signing_in">กำลังลงชื่อเข้า…</string>
+    <string moz:removedIn="96" name="onboarding_firefox_account_signing_in" tools:ignore="UnusedResources">กำลังลงชื่อเข้า…</string>
     <!-- text for the button to manually sign into Firefox account. -->
     <string name="onboarding_firefox_account_sign_in_1">ลงทะเบียน</string>
     <!-- text for the button to stay signed out when presented with an option to automatically sign-in. -->
-    <string name="onboarding_firefox_account_stay_signed_out">ลงชื่อออกต่อไป</string>
+    <string moz:removedIn="96" name="onboarding_firefox_account_stay_signed_out" tools:ignore="UnusedResources">ลงชื่อออกต่อไป</string>
     <!-- text to display in the snackbar once account is signed-in -->
     <string name="onboarding_firefox_account_sync_is_on">Sync เปิดอยู่</string>
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
-    <string name="onboarding_firefox_account_automatic_signin_failed">ไม่สามารถเข้าสู่ระบบ</string>
+    <string moz:removedIn="96" name="onboarding_firefox_account_automatic_signin_failed" tools:ignore="UnusedResources">ไม่สามารถเข้าสู่ระบบ</string>
     <!-- text for the tracking protection onboarding card header -->
     <string name="onboarding_tracking_protection_header_3">ความเป็นส่วนตัวตลอดเวลา</string>
     <!-- text for the tracking protection card description. 'Firefox' intentionally hardcoded here -->
@@ -1399,7 +1358,7 @@
     <!-- text for standard blocking option button description -->
     <string name="onboarding_tracking_protection_standard_button_description_3">ความเป็นส่วนตัวและประสิทธิภาพแบบสมดุล หน้าเว็บจะโหลดเป็นปกติ</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_button">เข้มงวด (แนะนำ)</string>
+    <string moz:removedIn="96" name="onboarding_tracking_protection_strict_button" tools:ignore="UnusedResources">เข้มงวด (แนะนำ)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">เข้มงวด</string>
     <!-- text for strict blocking option button description -->
@@ -1408,15 +1367,6 @@
     <string name="onboarding_toolbar_placement_header_1">เลือกตำแหน่งแถบเครื่องมือของคุณ</string>
     <!-- text for the toolbar position card description -->
     <string name="onboarding_toolbar_placement_description_1">วางแถบเครื่องมือไว้ใกล้ ๆ เก็บไว้ที่ด้านล่างหรือย้ายไปด้านบน</string>
-    <!-- text for the private browsing onboarding card header -->
-    <string moz:removedIn="94" name="onboarding_private_browsing_header" tools:ignore="UnusedResources">เรียกดูอย่างเป็นส่วนตัว</string>
-    <!-- text for the private browsing onboarding card description
-    The first parameter is an icon that represents private browsing -->
-    <string moz:removedIn="94" name="onboarding_private_browsing_description1" tools:ignore="UnusedResources">เปิดแท็บส่วนตัวหนึ่งครั้ง: แตะที่ไอคอน %s</string>
-    <!-- text for the private browsing onboarding card description, explaining how to always using private browsing -->
-    <string moz:removedIn="94" name="onboarding_private_browsing_always_description" tools:ignore="UnusedResources">เปิดแท็บส่วนตัวทุกครั้ง: อัปเดตการตั้งค่าการเรียกดูแบบส่วนตัวของคุณ</string>
-    <!-- text for the private browsing onbording card button, that launches settings -->
-    <string moz:removedIn="94" name="onboarding_private_browsing_button" tools:ignore="UnusedResources">เปิดการตั้งค่า</string>
     <!-- text for the privacy notice onboarding card header -->
     <string name="onboarding_privacy_notice_header">ความเป็นส่วนตัวของคุณ</string>
     <!-- text for the privacy notice onboarding card description
@@ -1425,9 +1375,6 @@
     <!-- Text for the button to read the privacy notice -->
     <string name="onboarding_privacy_notice_read_button">อ่านประกาศความเป็นส่วนตัวของเรา</string>
 
-    <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
-    <string moz:removedIn="93" name="onboarding_close" tools:ignore="UnusedResources">ปิด</string>
-
     <!-- text for the button to finish onboarding -->
     <string name="onboarding_finish">เริ่มการเรียกดู</string>
 
@@ -1467,7 +1414,7 @@
     <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
     <string name="sign_in_create_account_text"><![CDATA[ไม่มีบัญชีใช่หรือไม่? <u>สร้างบัญชี</u>เพื่อซิงค์ Firefox ระหว่างอุปกรณ์]]></string>
     <!-- Text shown in confirmation dialog to sign out of account -->
-    <string name="sign_out_confirmation_message">Firefox จะหยุดการซิงค์กับบัญชีของคุณ แต่จะไม่ลบข้อมูลการเรียกดูใด ๆ ของคุณบนอุปกรณ์นี้</string>
+    <string moz:removedIn="96" name="sign_out_confirmation_message" tools:ignore="UnusedResources">Firefox จะหยุดการซิงค์กับบัญชีของคุณ แต่จะไม่ลบข้อมูลการเรียกดูใด ๆ ของคุณบนอุปกรณ์นี้</string>
     <!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="sign_out_confirmation_message_2">%s จะหยุดซิงค์กับบัญชีของคุณ แต่จะไม่ลบข้อมูลการท่องเว็บใด ๆ ของคุณบนอุปกรณ์นี้</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
@@ -1524,7 +1471,7 @@
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_2">เฉพาะในแท็บส่วนตัว</string>
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
-    <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">เฉพาะในแท็บที่กำหนดเอง</string>
+    <string moz:removedIn="96" name="preference_enhanced_tracking_protection_custom_tracking_content_3" tools:ignore="UnusedResources">เฉพาะในแท็บที่กำหนดเอง</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_cryptominers">ตัวขุดเหรียญดิจิทัล</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
@@ -1556,8 +1503,6 @@
     <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_tracking_content_description">หยุดไม่ให้โหลดโฆษณาภายนอก, วิดีโอ, และเนื้อหาอื่น ๆ ที่มีรหัสการติดตาม อาจส่งผลต่อฟังก์ชันการทำงานของบางเว็บไซต์</string>
 
-    <!-- Enhanced Tracking Protection Onboarding Message shown in a dialog above the toolbar. The first parameter is the name of the application (For example: Fenix) -->
-    <string moz:removedIn="93" name="etp_onboarding_cfr_message" tools:ignore="UnusedResources">ทุกครั้งที่โล่เป็นสีม่วง %s ได้ทำการปิดกั้นตัวติดตามบนไซต์ แตะเพื่ออ่านข้อมูลเพิ่มเติม</string>
     <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
     <string name="etp_panel_on">การป้องกันถูก เปิด สำหรับไซต์นี้</string>
     <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
@@ -1568,9 +1513,9 @@
     back from ETP details (Ex: Tracking content) -->
     <string name="etp_back_button_content_description">นำทางย้อนกลับ</string>
     <!-- About page Your rights link text -->
-    <string name="about_your_rights">สิทธิของคุณ</string>
+    <string moz:removedIn="96" name="about_your_rights" tools:ignore="UnusedResources">สิทธิของคุณ</string>
     <!-- About page link text to open open source licenses screen -->
-    <string name="about_open_source_licenses">ไลบรารีเปิดต้นฉบับที่เราใช้</string>
+    <string moz:removedIn="96" name="about_open_source_licenses" tools:ignore="UnusedResources">ไลบรารีเปิดต้นฉบับที่เราใช้</string>
     <!-- About page link text to open what's new link -->
     <string name="about_whats_new">มีอะไรใหม่ใน %s</string>
     <!-- Open source licenses page title
@@ -1607,9 +1552,9 @@
     <string name="about_debug_menu_toast_done">เปิดใช้งานเมนูดีบั๊ก</string>
 
     <!-- Content description of the tab counter toolbar button when one tab is open -->
-    <string name="tab_counter_content_description_one_tab">1 แท็บ</string>
+    <string moz:removedIn="96" name="tab_counter_content_description_one_tab" tools:ignore="UnusedResources">1 แท็บ</string>
     <!-- Content description of the tab counter toolbar button when multiple tabs are open. First parameter will be replaced with the number of tabs (always more than one) -->
-    <string name="tab_counter_content_description_multi_tab">%d แท็บ</string>
+    <string moz:removedIn="96" name="tab_counter_content_description_multi_tab" tools:ignore="UnusedResources">%d แท็บ</string>
 
     <!-- Browser long press popup menu -->
     <!-- Copy the current url -->
@@ -1644,8 +1589,6 @@
     <string name="preferences_passwords_save_logins_ask_to_save">ถามเพื่อบันทึก</string>
     <!-- Preference option for never saving passwords in Fenix -->
     <string name="preferences_passwords_save_logins_never_save">ไม่บันทึกเสมอ</string>
-    <!-- Preference for autofilling saved logins in Fenix -->
-    <string moz:removedIn="93" name="preferences_passwords_autofill" tools:ignore="UnusedResources">การเติมอัตโนมัติ</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">กรอกอัตโนมัติ %1$s</string>
@@ -1664,9 +1607,9 @@
     <!-- Preference for syncing saved logins in Fenix, when not signed in-->
     <string name="preferences_passwords_sync_logins_across_devices">ซิงค์การเข้าสู่ระบบระหว่างอุปกรณ์</string>
     <!-- Syncing saved logins in Fenix needs reconnect to sync -->
-    <string name="preferences_passwords_sync_logins_reconnect">เชื่อมต่อใหม่</string>
+    <string moz:removedIn="96" name="preferences_passwords_sync_logins_reconnect" tools:ignore="UnusedResources">เชื่อมต่อใหม่</string>
     <!-- Syncing saved logins in Fenix needs login -->
-    <string name="preferences_passwords_sync_logins_sign_in">ลงชื่อเข้าไปยัง Sync</string>
+    <string moz:removedIn="96" name="preferences_passwords_sync_logins_sign_in" tools:ignore="UnusedResources">ลงชื่อเข้าไปยัง Sync</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">การเข้าสู่ระบบที่บันทึกไว้</string>
     <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
@@ -1684,9 +1627,9 @@
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">ค้นหาการเข้าสู่ระบบ</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
-    <string name="preferences_passwords_saved_logins_alphabetically">ตามตัวอักษร</string>
+    <string moz:removedIn="96" name="preferences_passwords_saved_logins_alphabetically" tools:ignore="UnusedResources">ตามตัวอักษร</string>
     <!-- Option to sort logins list by most recently used -->
-    <string name="preferences_passwords_saved_logins_recently_used">เพิ่งใช้ล่าสุด</string>
+    <string moz:removedIn="96" name="preferences_passwords_saved_logins_recently_used" tools:ignore="UnusedResources">เพิ่งใช้ล่าสุด</string>
     <!-- The header for the site that a login is for -->
     <string name="preferences_passwords_saved_logins_site">ไซต์</string>
     <!-- The header for the username for a login -->
@@ -1694,25 +1637,25 @@
     <!-- The header for the password for a login -->
     <string name="preferences_passwords_saved_logins_password">รหัสผ่าน</string>
     <!-- Message displayed in security prompt to reenter a secret pin to access saved logins -->
-    <string name="preferences_passwords_saved_logins_enter_pin">ป้อน PIN ของคุณใหม่อีกครั้ง</string>
+    <string moz:removedIn="96" name="preferences_passwords_saved_logins_enter_pin" tools:ignore="UnusedResources">ป้อน PIN ของคุณใหม่อีกครั้ง</string>
     <!-- Message displayed in security prompt to access saved logins -->
-    <string name="preferences_passwords_saved_logins_enter_pin_description">ปลดล็อกเพื่อดูการเข้าสู่ระบบที่บันทึกไว้ของคุณ</string>
+    <string moz:removedIn="96" name="preferences_passwords_saved_logins_enter_pin_description" tools:ignore="UnusedResources">ปลดล็อกเพื่อดูการเข้าสู่ระบบที่บันทึกไว้ของคุณ</string>
     <!-- Message displayed when a connection is insecure and we detect the user is entering a password -->
-    <string name="logins_insecure_connection_warning">การเชื่อมต่อนี้ไม่ปลอดภัย การเข้าสู่ระบบที่ป้อนในที่นี้อาจถูกบุกรุกได้</string>
+    <string moz:removedIn="96" name="logins_insecure_connection_warning" tools:ignore="UnusedResources">การเชื่อมต่อนี้ไม่ปลอดภัย การเข้าสู่ระบบที่ป้อนในที่นี้อาจถูกบุกรุกได้</string>
     <!-- Learn more link that will link to a page with more information displayed when a connection is insecure and we detect the user is entering a password -->
-    <string name="logins_insecure_connection_warning_learn_more">เรียนรู้เพิ่มเติม</string>
+    <string moz:removedIn="96" name="logins_insecure_connection_warning_learn_more" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติม</string>
     <!-- Prompt message displayed when Fenix detects a user has entered a password and user decides if Fenix should save it. The first parameter is the name of the application (For example: Fenix)  -->
-    <string name="logins_doorhanger_save">คุณต้องการให้ %s บันทึกการเข้าสู่ระบบนี้หรือไม่?</string>
+    <string moz:removedIn="96" name="logins_doorhanger_save" tools:ignore="UnusedResources">คุณต้องการให้ %s บันทึกการเข้าสู่ระบบนี้หรือไม่?</string>
     <!-- Positive confirmation that Fenix should save the new or updated login -->
-    <string name="logins_doorhanger_save_confirmation">บันทึก</string>
+    <string moz:removedIn="96" name="logins_doorhanger_save_confirmation" tools:ignore="UnusedResources">บันทึก</string>
     <!-- Negative confirmation that Fenix should not save the new or updated login -->
-    <string name="logins_doorhanger_save_dont_save">ไม่บันทึก</string>
+    <string moz:removedIn="96" name="logins_doorhanger_save_dont_save" tools:ignore="UnusedResources">ไม่บันทึก</string>
     <!-- Shown in snackbar to tell user that the password has been copied -->
     <string name="logins_password_copied">คัดลอกรหัสผ่านไปยังคลิปบอร์ดแล้ว</string>
     <!-- Shown in snackbar to tell user that the username has been copied -->
     <string name="logins_username_copied">คัดลอกชื่อผู้ใช้ไปยังคลิปบอร์ดแล้ว</string>
     <!-- Shown in snackbar to tell user that the site has been copied -->
-    <string name="logins_site_copied">คัดลอกไซต์ไปยังคลิปบอร์ดแล้ว</string>
+    <string moz:removedIn="96" name="logins_site_copied" tools:ignore="UnusedResources">คัดลอกไซต์ไปยังคลิปบอร์ดแล้ว</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">คัดลอกรหัสผ่าน</string>
     <!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
@@ -1724,7 +1667,7 @@
     <!-- Content Description (for screenreaders etc) read for the button to clear the hostname field while creating a login -->
     <string name="saved_login_clear_hostname">ล้างชื่อโฮสต์</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
-    <string name="saved_login_copy_site">คัดลอกไซต์</string>
+    <string moz:removedIn="96" name="saved_login_copy_site" tools:ignore="UnusedResources">คัดลอกไซต์</string>
     <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
     <string name="saved_login_open_site">เปิดไซต์ในเบราว์เซอร์</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
@@ -1787,7 +1730,7 @@
     <!-- The header for the name on the credit card -->
     <string name="credit_cards_name_on_card">ชื่อบนบัตร</string>
     <!-- The header for the nickname for a credit card -->
-    <string name="credit_cards_card_nickname">ชื่อย่อบัตร</string>
+    <string moz:removedIn="96" name="credit_cards_card_nickname" tools:ignore="UnusedResources">ชื่อย่อบัตร</string>
     <!-- The text for the "Delete card" menu item for deleting a credit card -->
     <string name="credit_cards_menu_delete_card">ลบบัตร</string>
     <!-- The text for the "Delete card" button for deleting a credit card -->
@@ -1843,17 +1786,17 @@
     <!-- Description text for the Search String TextField. The %s is part of the string -->
     <string formatted="false" name="search_add_custom_engine_search_string_example">แทนที่คำค้นด้วย “%s” ตัวอย่าง:\nhttps://www.google.com/search?q=%s</string>
     <!-- Text for the button to learn more about adding a custom search engine -->
-    <string name="search_add_custom_engine_learn_more_label">เรียนรู้เพิ่มเติม</string>
+    <string moz:removedIn="96" name="search_add_custom_engine_learn_more_label" tools:ignore="UnusedResources">เรียนรู้เพิ่มเติม</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>
     <!-- Accessibility description for the 'Learn more' link -->
-    <string name="search_add_custom_engine_learn_more_description">ลิงก์เรียนรู้เพิ่มเติม</string>
+    <string moz:removedIn="96" name="search_add_custom_engine_learn_more_description" tools:ignore="UnusedResources">ลิงก์เรียนรู้เพิ่มเติม</string>
 
     <!-- Text shown when a user leaves the name field empty -->
     <string name="search_add_custom_engine_error_empty_name">ป้อนชื่อเครื่องมือค้นหา</string>
     <!-- Text shown when a user tries to add a search engine that already exists -->
-    <string name="search_add_custom_engine_error_existing_name">มีเครื่องมือค้นหาชื่อ “%s” อยู่แล้ว</string>
+    <string moz:removedIn="96" name="search_add_custom_engine_error_existing_name" tools:ignore="UnusedResources">มีเครื่องมือค้นหาชื่อ “%s” อยู่แล้ว</string>
     <!-- Text shown when a user leaves the search string field empty -->
     <string name="search_add_custom_engine_error_empty_search_string">ป้อนสตริงการค้นหา</string>
     <!-- Text shown when a user leaves out the required template string -->
@@ -1893,10 +1836,6 @@
     <string name="quick_settings_sheet_secure_connection_2">การเชื่อมต่อปลอดภัย</string>
     <!-- Label that indicates a site is using a insecure connection -->
     <string name="quick_settings_sheet_insecure_connection_2">การเชื่อมต่อไม่ปลอดภัย</string>
-    <!-- Label that indicates a site is using a secure connection -->
-    <string moz:removedIn="94" name="quick_settings_sheet_secure_connection" tools:ignore="UnusedResources">การเชื่อมต่อปลอดภัย</string>
-    <!-- Label that indicates a site is using a insecure connection -->
-    <string moz:removedIn="94" name="quick_settings_sheet_insecure_connection" tools:ignore="UnusedResources">การเชื่อมต่อไม่ปลอดภัย</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
     <string name="confirm_clear_permissions_on_all_sites">คุณแน่ใจหรือไม่ว่าต้องการล้างสิทธิอนุญาตทั้งหมดบนไซต์ทั้งหมด?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
@@ -1906,7 +1845,7 @@
     <!-- label shown when there are not site exceptions to show in the site exception settings -->
     <string name="no_site_exceptions">ไม่มีข้อยกเว้นไซต์</string>
     <!-- Label for the Pocket default top site -->
-    <string name="pocket_top_articles">สุดยอดบทความ</string>
+    <string moz:removedIn="96" name="pocket_top_articles" tools:ignore="UnusedResources">สุดยอดบทความ</string>
     <!-- Bookmark deletion confirmation -->
     <string name="bookmark_deletion_confirmation">คุณแน่ใจหรือไม่ว่าต้องการลบที่คั่นหน้านี้?</string>
     <!-- Browser menu button that adds a top site to the home fragment -->
@@ -1933,7 +1872,7 @@
     <!--  The button description to save changes to an edited login. -->
     <string name="save_changes_to_login">บันทึกการเปลี่ยนแปลงเพื่อเข้าสู่ระบบ</string>
     <!--  The button description to discard changes to an edited login. -->
-    <string name="discard_changes">ละทิ้งการเปลี่ยนแปลง</string>
+    <string moz:removedIn="96" name="discard_changes" tools:ignore="UnusedResources">ละทิ้งการเปลี่ยนแปลง</string>
     <!--  The page title for editing a saved login. -->
     <string name="edit">แก้ไข</string>
     <!--  The page title for adding new login. -->
@@ -1955,8 +1894,6 @@
     <!-- This is the hint text that is shown inline on the hostname field of the create new login page. 'https://www.example.com' intentionally hardcoded here -->
     <string name="add_login_hostname_hint_text">https://www.example.com</string>
     <!-- This is an error message shown below the hostname field of the add login page when a hostname does not contain http or https. -->
-    <string moz:removedIn="94" name="add_login_hostname_invalid_text_1" tools:ignore="UnusedResources">ที่อยู่เว็บต้องมี \“https://\“ หรือ \“http://\“</string>
-    <!-- This is an error message shown below the hostname field of the add login page when a hostname does not contain http or https. -->
     <string name="add_login_hostname_invalid_text_3">ที่อยู่เว็บต้องมี &quot;https://&quot; หรือ &quot;http://&quot;</string>
     <!-- This is an error message shown below the hostname field of the add login page when a hostname is invalid. -->
     <string name="add_login_hostname_invalid_text_2">ต้องการชื่อโฮสต์ที่ถูกต้อง</string>
@@ -1987,12 +1924,8 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">ตกลง เข้าใจแล้ว</string>
 
-    <!-- Label for the preference to show the most visited top sites on the homepage -->
-    <string name="top_sites_toggle_top_recent_sites_3">ไซต์เด่นที่เยี่ยมชมบ่อยที่สุด</string>
-    <!-- Label for the show most visited top sites preference -->
-    <string moz:removedIn="94" name="top_sites_toggle_top_frecent_sites_2" tools:ignore="UnusedResources">แสดงไซต์เด่นที่เยี่ยมชมบ่อยที่สุด</string>
-    <!-- Label for the show most visited sites preference -->
-    <string moz:removedIn="93" name="top_sites_toggle_top_frecent_sites" tools:ignore="UnusedResources">แสดงไซต์ที่เยี่ยมชมบ่อยที่สุด</string>
+    <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
+    <string moz:removedIn="98" name="top_sites_toggle_top_recent_sites_3" tools:ignore="UnusedResources">ไซต์เด่นที่เยี่ยมชมบ่อยที่สุด</string>
 
     <!-- Title text displayed in the rename top site dialog. -->
 	<string name="top_sites_rename_dialog_title">ชื่อ</string>
@@ -2003,17 +1936,16 @@
 	<!-- Dialog button text for canceling the rename top site prompt. -->
 	<string name="top_sites_rename_dialog_cancel">ยกเลิก</string>
 
+    <!-- Text for the menu button to open the homepage settings. -->
+    <string name="top_sites_menu_settings">ตั้งค่า</string>
+    <!-- Label text displayed for a sponsored top site. -->
+    <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. -->
     <string name="inactive_tabs_title">แท็บที่ไม่ได้ใช้งาน</string>
     <!-- Content description for closing all inactive tabs -->
     <string name="inactive_tabs_delete_all">ปิดแท็บที่ไม่ได้ใช้งานทั้งหมด</string>
-    <!-- A description below the section of "inactive" tabs to notify the user when those tabs will be closed, if appropriate. See strings inactive_tabs_30_days and inactive_tabs_7_days for placeholders options. -->
-    <string moz:removedIn="95" name="inactive_tabs_description" tools:ignore="UnusedResources">แท็บจะปรากฏที่นี่เป็นเวลา %s หลังจากนั้น แท็บต่าง ๆ จะถูกปิดโดยอัตโนมัติ</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_30_days" tools:ignore="UnusedResources">30 วัน</string>
-    <!-- The amount of time until a tab in the "inactive" section of the tabs tray will be closed. See string inactive_tabs_description as well -->
-    <string moz:removedIn="95" name="inactive_tabs_7_days" tools:ignore="UnusedResources">1 สัปดาห์</string>
 
     <!-- Inactive tabs auto-close message in the tabs tray -->
     <!-- The header text of the auto-close message when the user is asked if they want to turn on the auto-closing of inactive tabs. -->
@@ -2028,8 +1960,6 @@
 
     <!-- Inactive tabs survey -->
     <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_header" tools:ignore="UnusedResources">ช่วยปรับปรุง Firefox</string>
-    <!-- Header text for the inactive tabs survey asking for feedback to improve the inactive tabs feature. -->
     <string name="inactive_tabs_survey_header_1">ช่วยปรับปรุง Firefox</string>
 
     <!-- Content text for the inactive tabs survey asking the primary survey feedback question. -->
@@ -2039,12 +1969,8 @@
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_do_it_myself">ฉันชอบล้างแท็บเก่าด้วยตัวเอง</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_long_option" tools:ignore="UnusedResources">ระยะเวลา 2 สัปดาห์ยาวเกินไป</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_long_option_1">ระยะเวลา 2 สัปดาห์ยาวเกินไป</string>
     <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
-    <string moz:removedIn="95" name="inactive_tabs_survey_time_too_short_option" tools:ignore="UnusedResources">ระยะเวลา 2 สัปดาห์สั้นเกินไป</string>
-    <!-- One of the feedback option that can be selected as a responses to the inactive tabs survey question. -->
     <string name="inactive_tabs_survey_time_too_short_option_1">ระยะเวลา 2 สัปดาห์สั้นเกินไป</string>
     <!-- Confirmation button text to submit the feedback for the inactive tabs survey. -->
     <string name="inactive_tabs_survey_send_button">ส่ง</string>
@@ -2068,8 +1994,6 @@
 
     <!-- Pocket recommended stories -->
     <!-- Header text for a section on the home screen. -->
-    <string moz:removedIn="94" name="pocket_stories_header" tools:ignore="UnusedResources">เรื่องราวที่จุดประกายความคิด</string>
-    <!-- Header text for a section on the home screen. -->
     <string name="pocket_stories_header_1">เรื่องราวที่จุดประกายความคิด</string>
     <!-- Header text for a section on the home screen. -->
     <string name="pocket_stories_categories_header">เรื่องตามหัวข้อ</string>