From 1ef7ec5b8f7c04f680bd82b77eceb4f40e2d4d46 Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Mon, 9 Nov 2020 04:40:18 +0000
Subject: [PATCH 1/7] Update to Android-Components 63.0.7. (#16452)

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

diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 9906fe70e..209e0d7a0 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "63.0.6"
+    const val VERSION = "63.0.7"
 }

From 6495d1468cfe4e18766e49a9aa8a3f0d87d22c59 Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Tue, 10 Nov 2020 19:30:54 -0500
Subject: [PATCH 2/7] Update l10n-release.toml to include gl and sat (#16491)

---
 l10n-release.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/l10n-release.toml b/l10n-release.toml
index 345a445de..8bc678f7f 100644
--- a/l10n-release.toml
+++ b/l10n-release.toml
@@ -36,6 +36,7 @@ locales = [
   "fy-NL",
   "ga-IE",
   "gd",
+  "gl",
   "gn",
   "gu-IN",
   "he",
@@ -70,6 +71,7 @@ locales = [
   "rm",
   "ro",
   "ru",
+  "sat",
   "sk",
   "sl",
   "sq",

From 086386e8f694508ba148b6a4fe2683ac97fe7615 Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Wed, 11 Nov 2020 10:55:10 -0500
Subject: [PATCH 3/7] String import to releases/v83 (2020-11-11) (#16504)

* Import l10n.

(cherry picked from commit 5739140ff31b9513fa9072e96d77f41e41a35287)

* Import l10n.

(cherry picked from commit bf69519dc96dfadd05940a0518d56c3c7e835243)

* Import l10n.

(cherry picked from commit e61e5b80dd6fb76d06e8e106803ca4a62d4c06be)

* Import l10n.

(cherry picked from commit 1ad5ea58a2931f47c463c4635621ca7c37b061e9)

Co-authored-by: Mozilla L10n Automation Bot <release+l10n-automation-bot@mozilla.com>
---
 app/src/main/res/values-ar/strings.xml        |   3 +
 app/src/main/res/values-ast/strings.xml       |   8 +
 app/src/main/res/values-be/strings.xml        |   2 +-
 app/src/main/res/values-co/strings.xml        |   8 +
 app/src/main/res/values-cs/strings.xml        |  34 ++
 app/src/main/res/values-fr/strings.xml        |  20 +
 app/src/main/res/values-gl/strings.xml        | 446 ++++++++++++++++++
 app/src/main/res/values-lt/strings.xml        |   7 +
 app/src/main/res/values-oc/strings.xml        |   2 +
 app/src/main/res/values-pa-rIN/strings.xml    |   6 +
 .../strings.xml                               |  13 +
 app/src/main/res/values-sl/strings.xml        |   7 +
 app/src/main/res/values-su/strings.xml        |  34 ++
 app/src/main/res/values-tl/strings.xml        |  64 +++
 l10n.toml                                     |   2 +-
 15 files changed, 654 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-gl/strings.xml
 rename app/src/main/res/{values-b+sat+Olck => values-sat}/strings.xml (98%)
 create mode 100644 app/src/main/res/values-tl/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c4f93eec6..8fc01d611 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1285,6 +1285,9 @@
     <string name="etp_panel_off">عُطّلت الحماية في هذا الموقع</string>
     <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
     <string name="enhanced_tracking_protection_exceptions">عُطّلت الحماية الموسّعة من التعقب لهذه المواقع</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate
+    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>
     <!-- About page link text to open open source licenses screen -->
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 31c3f61ca..bfe511e91 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -340,6 +340,9 @@
     <!-- Button caption to abort the add-on collection configuration -->
     <string name="customize_addon_collection_cancel">Encaboxar</string>
 
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Modificóse la coleición de complementos. L\'aplicación va zarrase p\'aplicar los cambeos…</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincronizar agora</string>
@@ -726,6 +729,8 @@
     <string name="preference_phone_feature_location">Allugamientu</string>
     <!-- Preference for altering the notification access for all websites -->
     <string name="preference_phone_feature_notification">Avisos</string>
+    <!-- Preference for altering the persistent storage access for all websites -->
+    <string name="preference_phone_feature_persistent_storage">Almacenamientu permanente</string>
     <!-- Label that indicates that a permission must be asked always -->
     <string name="preference_option_phone_feature_ask_to_allow">Entrugar pa permitir</string>
     <!-- Label that indicates that a permission must be blocked -->
@@ -1204,6 +1209,9 @@
     <string name="etp_panel_off">DESACTIVÓSE nesti sitiu</string>
     <!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
     <string name="enhanced_tracking_protection_exceptions">La proteición ameyorada escontra\'l rastrexu ta desactivada pa estos sitios web</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate
+    back from ETP details (Ex: Tracking content) -->
+    <string name="etp_back_button_content_description">Dir p\'atrás</string>
     <!-- About page Your rights link text -->
     <string name="about_your_rights">Los tos drechos</string>
     <!-- About page link text to open open source licenses screen -->
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index c52f316c5..d1a52ff2e 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -490,7 +490,7 @@
 
     <!-- Gestures Preferences-->
     <!-- Preferences for using pull to refresh in a webpage -->
-    <string name="preference_gestures_website_pull_to_refresh">Пацягніце, каб абнавіць</string>
+    <string name="preference_gestures_website_pull_to_refresh">Пацягнуць, каб абнавіць</string>
 
     <!-- Preference for using the dynamic toolbar -->
     <string name="preference_gestures_dynamic_toolbar">Пракруціць, каб схаваць панэль інструментаў</string>
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index 094e4bdda..5b00a0596 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -352,6 +352,9 @@
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Nutificazioni</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Cullezzione persunalizata di moduli addiziunale</string>
     <!-- Button caption to confirm the add-on collection configuration -->
     <string name="customize_addon_collection_ok">Vai</string>
     <!-- Button caption to abort the add-on collection configuration -->
@@ -361,6 +364,9 @@
     <!-- Hint displayed on input field for custom collection user ID-->
     <string name="customize_addon_collection_user_hint">Prupietariu di a cullezzione (Id. d’utilizatore)</string>
 
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Cullezzione di moduli addiziunale mudificata. Chjusura di l’appiecazione per piglialla in contu…</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Sincrunizà avà</string>
@@ -547,6 +553,8 @@
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">Unghjette</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Vista di l’unghjette</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">Lista</string>
     <!-- Option for a grid tab view -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4e8b6e594..c248ea96f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -220,6 +220,8 @@
     <string name="search_suggestions_onboarding_learn_more_link">Zjistit více</string>
 
     <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">Otevřít nový panel Firefoxu</string>
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">Vyhledávání</string>
     <!-- Text preview for larger sized widgets -->
@@ -350,6 +352,20 @@
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Oznámení</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Vlastní sbírka doplňků</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">OK</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">Zrušit</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Název sbírky</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">Vlastník sbírky (ID uživatele)</string>
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Nastavení sbírky změněno. Pro aplikování změn se nyní aplikace ukončí…</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchronizovat</string>
@@ -536,6 +552,15 @@
     <!-- Recently closed tabs screen message when there are no recently closed tabs -->
     <string name="recently_closed_empty_message">Nemáte žádné nedávno zavřené panely</string>
 
+    <!-- Tab Management -->
+    <!-- Title of preference for tabs management -->
+    <string name="preferences_tabs">Panely</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Zobrazení panelů</string>
+    <!-- Option for a list tab view -->
+    <string name="tab_view_list">Seznam</string>
+    <!-- Option for a grid tab view -->
+    <string name="tab_view_grid">Mřížka</string>
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
     <string name="preferences_close_tabs">Zavírat panely</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
@@ -620,6 +645,8 @@
     <string name="collection_open_tabs">Otevřít panely</string>
 
 
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">Název sbírky</string>
     <!-- Text for the menu button to remove a top site -->
     <string name="remove_top_site">Odebrat</string>
 
@@ -658,6 +685,10 @@
     <!-- 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">Položek ke smazání: %1$d</string>
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">Dnes</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">Včera</string>
     <!-- Text for the header that groups the history for last 24 hours -->
     <string name="history_24_hours">Posledních 24 hodin</string>
     <!-- Text for the header that groups the history the past 7 days -->
@@ -1606,6 +1637,9 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_firefox_account_header">Využijte aplikaci %s naplno.</string>
 
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">Pro více informací klepněte zde</string>
+
     <!-- Deprecated: No Open Tabs Message Header -->
     <string name="no_collections_header1">Uložte si důležité věci do sbírek</string>
     <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index dbcf04c90..1060695d2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -351,6 +351,20 @@
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Notifications</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Collection de modules personnalisée</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">OK</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">Annuler</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Nom de la collection</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">Propriétaire de la collection (identifiant utilisateur)</string>
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Collection de modules complémentaires modifiée. Fermeture de l’application pour appliquer les modifications…</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Synchroniser maintenant</string>
@@ -541,6 +555,8 @@
     <!-- Tab Management -->
     <!-- Title of preference for tabs management -->
     <string name="preferences_tabs">Onglets</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Affichage des onglets</string>
     <!-- Option for a list tab view -->
     <string name="tab_view_list">Liste</string>
     <!-- Option for a grid tab view -->
@@ -663,6 +679,10 @@
     <!-- 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">Supprimer %1$d éléments</string>
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">Aujourd’hui</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">Hier</string>
     <!-- Text for the header that groups the history for last 24 hours -->
     <string name="history_24_hours">Dernières 24 heures</string>
     <!-- Text for the header that groups the history the past 7 days -->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 000000000..d6fac3f3a
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Home Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
+    <string name="content_description_menu">Máis opcións</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_private_browsing_button">Activar a navegación privada</string>
+    <!-- Content description (not visible, for screen readers etc.): "Private Browsing" menu button. -->
+    <string name="content_description_disable_private_browsing_button">Desactivar a navegación privada</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="search_hint">Buscar ou introducir enderezo</string>
+    <!-- No Open Tabs Message Description -->
+    <string name="no_open_tabs_description">As súas lapelas abertas aparecen aquí.</string>
+    <!-- No Private Tabs Message Description -->
+    <string name="no_private_tabs_description">As súas lapelas privadas aparecen aquí.</string>
+    <!-- Message announced to the user when tab tray is selected with 1 tab -->
+    <string name="open_tab_tray_single">1 lapela aberta. Toque para cambiar de lapela.</string>
+    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
+    <string name="open_tab_tray_plural">%1$s lapelas abertas. Toque para cambiar de lapela.</string>
+
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Engadir nova colección</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Nome</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Seleccionar colección</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Saír do modo multiselección</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Gardar as lapelas seleccionadas na colección</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">Seleccionada %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">Non seleccionada %1$s</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Saíu do modo multiselección</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Entrou no modo multiselección; seleccione lapelas para gardar nunha colección</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Seleccionada</string>
+
+    <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
+    <string name="about_content">%1$s é producido por Mozilla.</string>
+
+    <!-- Private Browsing -->
+    <!-- Title for private session option -->
+    <string name="private_browsing_title">Vostede está nunha sesión privada</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 limpa o historial de buscas e de navegación das lapelas privadas ao saír delas ou pechar a aplicación. Aínda que isto non conserva o seu anonimato en sitios web para o seu fornecedor de servizos de internet, si facilita manter en privado o que fai na rede para calquera outra persoa que utilice este ordenador.</string>
+    <string name="private_browsing_common_myths">
+       Mitos frecuentes sobre a navegación privada
+    </string>
+    <!-- Delete session button to erase your history in a private session -->
+    <string name="private_browsing_delete_session">Eliminar sesión</string>
+
+    <!-- Private mode shortcut "contextual feature recommendation" (CFR) -->
+    <!-- Text for the main message -->
+    <string name="cfr_message">Engada un atallo para abrir lapelas privadas desde a súa pantalla de inicio.</string>
+    <!-- Text for the positive button -->
+    <string name="cfr_pos_button_text">Engadir atallo</string>
+    <!-- Text for the negative button -->
+    <string name="cfr_neg_button_text">Non, grazas</string>
+
+    <!-- Search widget "contextual feature recommendation" (CFR) -->
+    <!-- Text for the main message. 'Firefox' intentionally hardcoded here.-->
+    <string name="search_widget_cfr_message">Accede ao Firefox máis rápido. Engada un widget á pantalla de inicio.</string>
+    <!-- Text for the positive button -->
+    <string name="search_widget_cfr_pos_button_text">Engadir widget</string>
+    <!-- Text for the negative button -->
+    <string name="search_widget_cfr_neg_button_text">Agora non</string>
+
+    <!-- Open in App "contextual feature recommendation" (CFR) -->
+    <!-- Text for the info message. 'Firefox' intentionally hardcoded here.-->
+    <string name="open_in_app_cfr_info_message">Pode configurar Firefox para que abra automaticamente as ligazóns en aplicacións.</string>
+    <!-- Text for the positive action button -->
+    <string name="open_in_app_cfr_positive_button_text">Ir á configuración</string>
+    <!-- Text for the negative action button -->
+    <string name="open_in_app_cfr_negative_button_text">Rexeitar</string>
+
+    <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
+    <string name="camera_permissions_needed_message">Necesítase acceso á cámara. Vai á configuración de Android, toque nos permisos e toque en permitir.</string>
+    <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
+    <string name="camera_permissions_needed_positive_button_text">Ir á configuración</string>
+    <!-- Text for the negative action button to dismiss the dialog. -->
+    <string name="camera_permissions_needed_negative_button_text">Rexeitar</string>
+
+    <!-- Text for the banner message to tell users about our auto close feature. -->
+    <string name="tab_tray_close_tabs_banner_message">Configure as lapelas abertas para que se pechen automaticamente se non se viron de novo onte, na semana ou no mes pasados.</string>
+    <!-- Text for the positive action button to go to Settings for auto close tabs. -->
+    <string name="tab_tray_close_tabs_banner_positive_button_text">Ver opcións</string>
+    <!-- Text for the negative action button to dismiss the Close Tabs Banner. -->
+    <string name="tab_tray_close_tabs_banner_negative_button_text">Rexeitar</string>
+
+    <!-- Home screen icons - Long press shortcuts -->
+    <!-- Shortcut action to open new tab -->
+    <string name="home_screen_shortcut_open_new_tab_2">Nova lapela</string>
+    <!-- Shortcut action to open new private tab -->
+    <string name="home_screen_shortcut_open_new_private_tab_2">Nova lapela privada</string>
+    <!-- Heading for the Top Sites block -->
+    <string name="home_screen_top_sites_heading">Sitios favoritos</string>
+
+    <!-- Browser Fragment -->
+    <!-- Content description (not visible, for screen readers etc.): Navigate to open tabs -->
+    <string name="browser_tabs_button">Lapelas abertas</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
+    <string name="browser_menu_back">Atrás</string>
+    <!-- Content description (not visible, for screen readers etc.): Navigate forward (browsing history) -->
+    <string name="browser_menu_forward">Adiante</string>
+    <!-- Content description (not visible, for screen readers etc.): Refresh current website -->
+    <string name="browser_menu_refresh">Actualizar</string>
+    <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
+    <string name="browser_menu_stop">Parar</string>
+    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
+    <string name="browser_menu_bookmark">Marcador</string>
+    <!-- Content description (not visible, for screen readers etc.): Un-bookmark the current page -->
+    <string name="browser_menu_edit_bookmark">Editar marcador</string>
+    <!-- Browser menu button that opens the addon manager -->
+    <string name="browser_menu_add_ons">Complementos</string>
+    <!-- Text displayed when there are no add-ons to be shown -->
+    <string name="no_add_ons">Aquí non hai complementos</string>
+    <!-- Browser menu button that sends a user to help articles -->
+    <string name="browser_menu_help">Axuda</string>
+    <!-- Browser menu button that sends a to a the what's new article -->
+    <string name="browser_menu_whats_new">Novidades</string>
+    <!-- Browser menu button that opens the settings menu -->
+    <string name="browser_menu_settings">Configuración</string>
+    <!-- Browser menu button that opens a user's library -->
+    <string name="browser_menu_library">Biblioteca</string>
+    <!-- Browser menu toggle that requests a desktop site -->
+    <string name="browser_menu_desktop_site">Sitio de escritorio</string>
+    <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. -->
+    <string name="browser_menu_add_to_homescreen">Engadir á páxina de inicio</string>
+    <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
+    <string name="browser_menu_install_on_homescreen">Instalar</string>
+    <!-- Menu option on the toolbar that takes you to synced tabs page-->
+    <string name="synced_tabs">Lapelas sincronizadas</string>
+    <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button -->
+    <string name="resync_button_content_description">Resincronizar</string>
+    <!-- Browser menu button that opens the find in page menu -->
+    <string name="browser_menu_find_in_page">Atopar na páxina</string>
+    <!-- Browser menu button that creates a private tab -->
+    <string name="browser_menu_private_tab">Lapela privada</string>
+    <!-- Browser menu button that creates a new tab -->
+    <string name="browser_menu_new_tab">Nova lapela</string>
+    <!-- Browser menu button that saves the current tab to a collection -->
+    <string name="browser_menu_save_to_collection_2">Gardar na colección</string>
+    <!-- Browser menu button that open a share menu to share the current site -->
+    <string name="browser_menu_share">Compartir</string>
+    <!-- Share menu title, displayed when a user is sharing their current site -->
+    <string name="menu_share_with">Compartir con…</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">Aberto en %1$s</string>
+    <!-- Browser menu button to put the current page in reader mode -->
+    <string name="browser_menu_read">Modo de lectura</string>
+    <!-- Browser menu button content description to close reader mode and return the user to the regular browser -->
+    <string name="browser_menu_read_close">Pechar a vista de lectura</string>
+    <!-- Browser menu button to open the current page in an external app -->
+    <string name="browser_menu_open_app_link">Abrir cunha aplicación</string>
+    <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
+    <string name="browser_menu_read_appearance">Aparencia</string>
+    <!-- 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">Non foi posíbel conectar. Non se recoñece este esquema de URL.</string>
+
+    <!-- Locale Settings Fragment -->
+    <!-- Content description for tick mark on selected language -->
+    <string name="a11y_selected_locale_content_description">Idioma seleccionado</string>
+    <!-- Content description for search icon -->
+    <string name="a11y_search_icon_content_description">Buscar</string>
+    <!-- Text for default locale item -->
+    <string name="default_locale_text">Igual que o idioma do dispositivo</string>
+    <!-- Placeholder text shown in the search bar before a user enters text -->
+    <string name="locale_search_hint">Buscar idioma</string>
+
+    <!-- Search Fragment -->
+    <!-- Button in the search view that lets a user search by scanning a QR code -->
+    <string name="search_scan_button">Escanear</string>
+
+    <!-- Button in the search view that lets a user change their search engine -->
+    <string name="search_engine_button">Motor de buscas</string>
+    <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
+    <string name="search_shortcuts_engine_settings">Configuración do motor de busca</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_engines_search_with">Desta volta, buscar con:</string>
+    <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
+    <string name="awesomebar_clipboard_title">Encher ligazón co portapapeis</string>
+    <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_allow_button">Permitir</string>
+    <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_do_not_allow_button">Non permitir</string>
+    <!-- Search suggestion onboarding hint title text -->
+    <string name="search_suggestions_onboarding_title">Permitir suxestións de busca nas sesións privadas?</string>
+    <!-- Search suggestion onboarding hint description text, first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="search_suggestions_onboarding_text">%s compartirá todo o que escriba na barra de enderezo co seu motor de busca predeterminado.</string>
+    <!-- Search suggestion onboarding hint Learn more link text -->
+    <string name="search_suggestions_onboarding_learn_more_link">Máis información</string>
+
+    <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">Abrir unha nova lapela de Firefox</string>
+    <!-- Text preview for smaller sized widgets -->
+    <string name="search_widget_text_short">Buscar</string>
+    <!-- Text preview for larger sized widgets -->
+    <string name="search_widget_text_long">Buscar na Rede</string>
+    <!-- Content description (not visible, for screen readers etc.): Voice search -->
+    <string name="search_widget_voice">Busca por voz</string>
+
+    <!-- Preferences -->
+    <!-- Title for the settings page-->
+    <string name="settings">Configuración</string>
+    <!-- Preference category for basic settings -->
+    <string name="preferences_category_basics">Básico</string>
+    <!-- Preference category for general settings -->
+    <string name="preferences_category_general">Xeral</string>
+    <!-- Preference category for all links about Fenix -->
+    <string name="preferences_category_about">Sobre</string>
+    <!-- Preference for settings related to changing the default search engine -->
+    <string name="preferences_default_search_engine">Motor de busca predeterminado</string>
+    <!-- Preference for settings related to Search -->
+    <string name="preferences_search">Buscas</string>
+    <!-- Preference for settings related to Search address bar -->
+    <string name="preferences_search_address_bar">Barra de enderezos</string>
+    <!-- Preference linking to help about Fenix -->
+    <string name="preferences_help">Axuda</string>
+    <!-- Preference link to rating Fenix on the Play Store -->
+    <string name="preferences_rate">Valorar en Google Play</string>
+    <!-- Preference for giving feedback about Fenix -->
+    <string name="preferences_feedback">Enviar opinión</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">Sobre o %1$s</string>
+    <!-- Preference linking to the your rights SUMO page -->
+    <string name="preferences_your_rights">Os seus dereitos</string>
+    <!-- Preference for settings related to saved passwords -->
+    <string name="preferences_passwords">Contrasinais</string>
+    <!-- Preference for settings related to saved credit cards and addresses -->
+    <string name="preferences_credit_cards_addresses">Tarxetas de crédito e enderezos</string>
+    <!-- Preference for settings related to changing the default browser -->
+    <string name="preferences_set_as_default_browser">Definir como navegador predeterminado</string>
+    <!-- Preference category for advanced settings -->
+    <string name="preferences_category_advanced">Opcións avanzadas</string>
+    <!-- Preference category for privacy settings -->
+    <string name="preferences_category_privacy">Privacidade</string>
+    <!-- Preference category for privacy and security settings -->
+    <string name="preferences_category_privacy_security">Privacidade e seguranza</string>
+    <!-- Preference for advanced site permissions -->
+    <string name="preferences_site_permissions">Permisos do sitio</string>
+    <!-- Preference for private browsing options -->
+    <string name="preferences_private_browsing_options">Navegación privada</string>
+    <!-- Preference for opening links in a private tab-->
+    <string name="preferences_open_links_in_a_private_tab">Abrir ligazóns nunha lapela privada</string>
+    <!-- Preference for allowing screenshots to be taken while in a private tab-->
+    <string name="preferences_allow_screenshots_in_private_mode">Permitir capturas de pantalla na navegación privada</string>
+    <!-- Will inform the user of the risk of activating Allow screenshots in private browsing option -->
+    <string name="preferences_screenshots_in_private_mode_disclaimer">Se se permite, as lapelas privadas tamén serán visíbeis ao estaren abertas varias aplicacións</string>
+    <!-- Preference for adding private browsing shortcut -->
+    <string name="preferences_add_private_browsing_shortcut">Engadir atallo de navegación privada</string>
+    <!-- Preference for accessibility -->
+    <string name="preferences_accessibility">Accesibilidade</string>
+    <!-- Preference to override the Firefox Account server -->
+    <string name="preferences_override_fxa_server">Servidor de contas de Firefox personalizado</string>
+    <!-- Preference to override the Sync token server -->
+    <string name="preferences_override_sync_tokenserver">Servidor de sincronización personalizado</string>
+    <!-- Toast shown after updating the FxA/Sync server override preferences -->
+    <string name="toast_override_fxa_sync_server_done">Modificouse o servidor de conta/sincronización de Firefox. Vaise saír da aplicación para aplicar os cambios…</string>
+    <!-- Preference category for account information -->
+    <string name="preferences_category_account">Conta</string>
+    <!-- Preference shown on banner to sign into account -->
+    <string name="preferences_sign_in">Identificarse</string>
+    <!-- Preference for changing where the toolbar is positioned -->
+    <string name="preferences_toolbar">Barra de ferramentas</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">Tema</string>
+    <!-- Preference for customizing the home screen -->
+    <string name="preferences_home">Inicio</string>
+    <!-- Preference for gestures based actions -->
+    <string name="preferences_gestures">Xestos</string>
+    <!-- Preference for settings related to visual options -->
+    <string name="preferences_customize">Personalizar</string>
+    <!-- Preference description for banner about signing in -->
+    <string name="preferences_sign_in_description">Sincronice marcadores, historial e moito máis coa súa conta de Firefox</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name">Conta de Firefox</string>
+    <!-- Preference text for account title when there was an error syncing FxA -->
+    <string name="preferences_account_sync_error">Reconectar para retomar a sincronización</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">Idioma</string>
+    <!-- Preference for data choices -->
+    <string name="preferences_data_choices">Escollas de datos</string>
+    <!-- Preference for data collection -->
+    <string name="preferences_data_collection">Recollida de datos</string>
+    <!-- Preference linking to the privacy notice -->
+    <string name="preferences_privacy_link">Aviso de privacidade</string>
+    <!-- Preference category for developer tools -->
+    <string name="developer_tools_category">Ferramentas de desenvolvemento</string>
+    <!-- Preference for developers -->
+    <string name="preferences_remote_debugging">Depuración remota por USB</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Mostrar motores de busca</string>
+    <!-- Preference title for switch preference to show search suggestions -->
+    <string name="preferences_show_search_suggestions">Mostrar suxestións de busca</string>
+    <!-- Preference title for switch preference to show voice search button -->
+    <string name="preferences_show_voice_search">Mostrar busca por voz</string>
+    <!-- Preference title for switch preference to show search suggestions also in private mode -->
+    <string name="preferences_show_search_suggestions_in_private">Mostrar en sesións privadas</string>
+    <!-- Preference title for switch preference to show a clipboard suggestion when searching -->
+    <string name="preferences_show_clipboard_suggestions">Mostrar suxestións do portapapeis</string>
+    <!-- Preference title for switch preference to suggest browsing history when searching -->
+    <string name="preferences_search_browsing_history">Buscar no historial de navegación</string>
+    <!-- Preference title for switch preference to suggest bookmarks when searching -->
+    <string name="preferences_search_bookmarks">Buscar nos marcadores</string>
+    <!-- Preference title for switch preference to suggest synced tabs when searching -->
+    <string name="preferences_search_synced_tabs">Buscar nas lapelas sincronizadas</string>
+    <!-- Preference for account settings -->
+    <string name="preferences_account_settings">Configuración da conta</string>
+    <!-- Preference for enabling url autocomplete-->
+    <string name="preferences_enable_autocomplete_urls">Completar automaticamente os URL</string>
+    <!-- Preference for open links in third party apps -->
+    <string name="preferences_open_links_in_apps">Abrir ligazóns con aplicacións</string>
+    <!-- Preference for open download with an external download manager app -->
+    <string name="preferences_external_download_manager">Xestor de descargas externo</string>
+    <!-- Preference for add_ons -->
+    <string name="preferences_addons">Complementos</string>
+    <!-- Preference for notifications -->
+    <string name="preferences_notifications">Notificacións</string>
+
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Colección de complementos personalizados</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">Aceptar</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">Cancelar</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Nome da colección</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">Propietario da colección (Identificador de usuario)</string>
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Modificouse a colección de complementos. Vaise saír da aplicación para aplicar os cambios…</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for triggering sync -->
+    <string name="preferences_sync_now">Sincronizar agora</string>
+    <!-- Preference category for sync -->
+    <string name="preferences_sync_category">Escolla que sincronizar</string>
+    <!-- Preference for syncing history -->
+    <string name="preferences_sync_history">Historial</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">Marcadores</string>
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">Identificacións</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">Lapelas abertas</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">Saír</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">Nome do dispositivo</string>
+    <!-- Text shown when user enters empty device name -->
+    <string name="empty_device_name_error">O nome do dispositivo non pode estar baleiro.</string>
+    <!-- Label indicating that sync is in progress -->
+    <string name="sync_syncing_in_progress">Sincronizando…</string>
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
+    <string name="sync_failed_summary">Fallou a sincronización. Último éxito: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_failed_never_synced_summary">Fallou a sincronización. Última sincronización: nunca</string>
+    <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
+    <string name="sync_last_synced_summary">Última sincronización: %s</string>
+    <!-- Label summary showing never synced -->
+    <string name="sync_never_synced_summary">Última sincronización: nunca</string>
+    <!-- Text for displaying the default device name.
+        The first parameter is the application name, the second is the device manufacturer name
+        and the third is the device model. -->
+    <string name="default_device_name_2">%1$s en %2$s %3$s</string>
+
+    <!-- Send Tab -->
+    <!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_name">Lapelas recibidas</string>
+    <!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
+    <string name="fxa_received_tab_channel_description">Notificacións de lapelas recibidas doutros dispositivos con Firefox.</string>
+    <!--  The body for these is the URL of the tab received  -->
+    <string name="fxa_tab_received_notification_name">Lapela recibida</string>
+    <!-- When multiple tabs have been received -->
+    <string name="fxa_tabs_received_notification_name">Lapelas recibidas</string>
+    <!-- %s is the device name -->
+    <string name="fxa_tab_received_from_notification_name">Lapela de %s</string>
+
+    <!-- Advanced Preferences -->
+    <!-- Preference for tracking protection settings -->
+    <string name="preferences_tracking_protection_settings">Protección contra o rastrexo</string>
+    <!-- Preference switch for tracking protection -->
+    <string name="preferences_tracking_protection"></string>
+    <!-- Preference switch description for tracking protection -->
+    <string name="preferences_tracking_protection_description">Bloquee o contido e os scripts que rastrexan a súa presenza na Rede</string>
+    <!-- Preference for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions">Excepcións</string>
+    <!-- Preference description for tracking protection exceptions -->
+    <string name="preferences_tracking_protection_exceptions_description">A protección contra o rastrexo está desactivada para estes sitios</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">Activar para todos os sitios</string>
+    <!-- Text displayed when there are no exceptions -->
+    <string name="exceptions_empty_message_description">As excepcións permiten desactivar a protección contra o rastrexo en sitios seleccionados.</string>
+    <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
+    <string name="exceptions_empty_message_learn_more_link">Máis información</string>
+
+    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
+    <string name="preferences_tracking_protection_turned_off_globally">Desactivado globalmente, vaia á Configuración para activala.</string>
+
+    <!-- Preference switch for Telemetry -->
+    <string name="preferences_telemetry">Telemetría</string>
+    <!-- Preference switch for usage and technical data collection -->
+    <string name="preference_usage_data">Uso e datos técnicos</string>
+
+    <!-- Preference description for usage and technical data collection -->
+    <string name="preferences_usage_data_description">Comparte datos de rendemento, uso, hardware e personalizacións sobre o seu navegador con Mozilla para axudarnos a mellorar %1$s</string>
+    <!-- Preference switch for marketing data collection -->
+    <string name="preferences_marketing_data">Datos de mercadotecnia</string>
+    <!-- Preference description for marketing data collection, parameter is the app name (e.g. Firefox) -->
+    <string name="preferences_marketing_data_description">Comparte datos sobre as funcións que usa en %1$s con Leanplum, o noso fornecedor de mercadotecnia móbil.</string>
+    <!-- Title for experiments preferences -->
+    <string name="preference_experiments">Experimentos</string>
+    <!-- Summary for experiments preferences -->
+    <string name="preference_experiments_summary">Permite que Mozilla instale e recolla datos sobre funcións experimentais</string>
+    <!-- Preference switch for crash reporter -->
+    <string name="preferences_crash_reporter">Informador de fallos</string>
+    <!-- Preference switch for Mozilla location service -->
+    <string name="preferences_mozilla_location_service">Servizo de localización de 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">informe de saúde de %s</string>
+
+    <!-- Turn On Sync Preferences -->
+    <!-- Header of the Turn on Sync preference view -->
+    <string name="preferences_sync">Activar a sincronización</string>
+    <!-- Preference for pairing -->
+    <string name="preferences_sync_pair">Escanear código de emparellamento no Firefox par aescritorio</string>
+    <!-- Preference for account login -->
+    <string name="preferences_sync_sign_in">Identificarse</string>
+    <!-- Preference for reconnecting to FxA sync -->
+    <string name="preferences_sync_sign_in_to_reconnect">Identifíquese para reconectar</string>
+    <!-- Preference for removing FxA account -->
+    <string name="preferences_sync_remove_account">Retirar conta</string>
+
+    </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 1baf32218..c638b7eb2 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -214,6 +214,8 @@
     <string name="search_suggestions_onboarding_learn_more_link">Sužinoti daugiau</string>
 
     <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">Atverti naują „Firefox“ kortelę</string>
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">Ieškoti</string>
     <!-- Text preview for larger sized widgets -->
@@ -628,6 +630,8 @@
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">Atverti korteles</string>
 
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">Rinkinio pavadinimas</string>
     <!-- Text for the menu button to remove a top site -->
     <string name="remove_top_site">Pašalinti</string>
 
@@ -1631,6 +1635,9 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_firefox_account_header">išnaudokite daugiau „%s“ galimybių.</string>
 
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">Spustelėkite čia, jeigu norite daugiau informacijos</string>
+
     <!-- Deprecated: No Open Tabs Message Header -->
     <string name="no_collections_header1">Kaupkite jums svarbius dalykus</string>
     <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c1f9079cb..990969485 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -1170,6 +1170,8 @@
     <string name="sign_in_with_camera">Connectatz-vos amb la camèra</string>
     <!-- Text shown for settings option for sign with email -->
     <string name="sign_in_with_email">Utilizar una adreça electronica allòc</string>
+    <!-- Text shown for settings option for create new account text.'Firefox' intentionally hardcoded here.-->
+    <string name="sign_in_create_account_text"><![CDATA[Cap de compte ? <u>Creatz-ne un</u> per sincronizar Firefox entre periferics.]]></string>
     <!-- Text shown in confirmation dialog to sign out of account -->
     <string name="sign_out_confirmation_message">Firefox quitarà de sincronizar vòstre compte mas escafarà pas las donadas de navegacion d’aqueste periferic.</string>
     <!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. Firefox Preview) -->
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index 054296a1d..d5f5160a5 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -82,11 +82,17 @@
     <!-- Text for the negative button -->
     <string name="search_widget_cfr_neg_button_text">ਹੁਣੇ ਨਹੀਂ</string>
 
+    <!-- Open in App "contextual feature recommendation" (CFR) -->
+    <!-- Text for the info message. 'Firefox' intentionally hardcoded here.-->
+    <string name="open_in_app_cfr_info_message">ਤੁਸੀਂ ਐਪਾਂ ਵਿਚਲੇ ਲਿੰਕਾਂ ਨੂੰ ਆਪਣੇ-ਆਪ Firefox ਨਾਲ ਖੋਲ੍ਹਣ ਲਈ ਸੈੱਟ ਕਰੋ।</string>
     <!-- Text for the positive action button -->
     <string name="open_in_app_cfr_positive_button_text">ਸੈਟਿੰਗਾਂ ਉੱਤੇ ਜਾਓ</string>
     <!-- Text for the negative action button -->
     <string name="open_in_app_cfr_negative_button_text">ਖ਼ਾਰਜ ਕਰੋ</string>
 
+    <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
+    <string name="camera_permissions_needed_message">ਕੈਮਰੇ ਲਈ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ। Android ਸੈਟਿੰਗਾਂ ਉੱਤੇ ਜਾਓ, ਇਜਾਜ਼ਤਾਂ ਨੂੰ
+ਛੂਹੋ ਅਤੇ ਇਜਾਜ਼ਤ ਨੂੰ ਛੂਹੋ।</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
     <string name="camera_permissions_needed_positive_button_text">ਸੈਟਿੰਗਾਂ ਉੱਤੇ ਜਾਓ</string>
     <!-- Text for the negative action button to dismiss the dialog. -->
diff --git a/app/src/main/res/values-b+sat+Olck/strings.xml b/app/src/main/res/values-sat/strings.xml
similarity index 98%
rename from app/src/main/res/values-b+sat+Olck/strings.xml
rename to app/src/main/res/values-sat/strings.xml
index 2f1d9bcbe..5825eec35 100644
--- a/app/src/main/res/values-b+sat+Olck/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -213,6 +213,8 @@
     <string name="search_suggestions_onboarding_learn_more_link">ᱰᱷᱮᱨ ᱥᱮᱬᱟᱭ ᱢᱮ</string>
 
     <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">ᱱᱟᱶᱟ Firefox ᱴᱮᱵ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮᱸ</string>
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">ᱥᱮᱸᱫᱽᱨᱟ</string>
     <!-- Text preview for larger sized widgets -->
@@ -625,6 +627,8 @@
     <string name="collection_rename">ᱛᱩᱢᱟᱹᱞ ᱫᱚᱦᱲᱟ ᱧᱩᱛᱩᱢ ᱢᱮ</string>
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">ᱡᱷᱤᱜ ᱴᱮᱵ ᱠᱚ</string>
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">ᱛᱩᱢᱟᱹᱞ ᱧᱩᱛᱩᱢ</string>
     <!-- Text for the menu button to remove a top site -->
     <string name="remove_top_site">ᱚᱪᱚᱜ ᱢᱮ</string>
     <!-- Text for the menu button to delete a top site from history -->
@@ -840,6 +844,8 @@
     <string name="collections_header">ᱛᱩᱢᱟᱹᱞ ᱠᱚ</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
     <string name="collection_menu_button_content_description">ᱛᱩᱢᱟᱹᱞ ᱢᱮᱱᱭᱩ</string>
+    <!-- Label to describe what collections are to a new user without any collections -->
+    <string name="no_collections_description2">ᱡᱤᱱᱤᱥ ᱠᱚ ᱡᱟᱣᱨᱟᱭ ᱢᱮ ᱚᱠᱟ ᱟᱢ ᱞᱟᱹᱜᱤᱫ ᱴᱷᱤᱠ ᱟ ᱾ \nᱞᱚᱜᱚᱱ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫ ᱥᱚᱢᱟᱱ ᱥᱮᱸᱫᱽᱨᱟ, ᱥᱟᱭᱤᱴ ᱟᱨ ᱴᱮᱵ ᱠᱚ ᱫᱳᱞ ᱠᱟᱜ ᱢᱮ ᱾</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">ᱴᱮᱵ ᱠᱚ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
     <!-- Title for the "select collection" step of the collection creator -->
@@ -982,6 +988,8 @@
     <string name="full_screen_notification">ᱯᱩᱨᱟᱹ ᱠᱨᱤᱱ ᱢᱳᱰ ᱵᱚᱞᱚᱱ ᱠᱟᱱᱟᱢ</string>
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL ᱱᱚᱠᱚᱞ ᱮᱱᱟ</string>
+    <!-- Sample text for accessibility font size -->
+    <string name="accessibility_text_size_sample_text_1">ᱱᱚᱶᱟ ᱫᱚ ᱡᱮᱢᱚᱱ ᱟᱲᱟ ᱠᱟᱱᱟ ᱾ ᱱᱚᱶᱟ ᱫᱚ ᱥᱟᱡᱟᱣ ᱵᱚᱫᱚᱞ ᱠᱚ ᱫᱮᱠᱷᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱠᱟᱱᱟ ᱚᱠᱟᱞᱠᱟᱛᱮ ᱟᱲᱟ ᱞᱚ ᱢᱟᱨᱟᱝ ᱟᱨ ᱵᱟᱝ ᱠᱟᱹᱴᱤᱡ ᱞᱮᱠᱷᱟᱱ ᱚᱠᱟᱞᱠᱟ ᱧᱮᱞᱚᱜᱼᱟ ᱾</string>
     <!-- Summary for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_text_size_summary">ᱣᱮᱵᱥᱟᱭᱤᱴ ᱨᱮ ᱚᱱᱚᱞ ᱠᱚ ᱢᱟᱨᱟᱝ ᱵᱟᱝᱠᱷᱟᱱ ᱦᱩᱰᱤᱧ ᱠᱚᱨᱟᱣ ᱢᱮ</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
@@ -1413,6 +1421,8 @@
     <string name="logins_biometric_prompt_message_pin">ᱟᱢᱟᱜ ᱥᱟᱫᱷᱚᱱ ᱚᱱᱞᱚᱠ ᱢᱮ</string>
     <!-- Title for Accessibility Force Enable Zoom Preference -->
     <string name="preference_accessibility_force_enable_zoom">ᱥᱟᱱᱟᱢ ᱣᱮᱵᱥᱟᱭᱤᱴ ᱨᱮ ᱦᱩᱰᱩᱧ ᱢᱮ</string>
+    <!-- Summary for Accessibility Force Enable Zoom Preference -->
+    <string name="preference_accessibility_force_enable_zoom_summary">ᱯᱤᱸᱪ ᱟᱨ ᱡᱩᱻᱢ ᱮᱢ ᱪᱷᱚᱭ ᱢᱮᱸ, ᱣᱮᱵᱥᱟᱭᱤᱴ ᱠᱚ ᱜᱮᱥᱪᱚᱨ ᱢᱟᱱᱟ ᱨᱮᱦᱚᱸ ᱱᱚᱶᱟ ᱮᱢ ᱪᱷᱚᱭ ᱢᱮᱸ᱾</string>
     <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
     <string name="saved_logins_sort_strategy_alphabetically">ᱧᱩᱛᱩᱢ (A-Z)</string>
 
@@ -1576,6 +1586,9 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_firefox_account_header">%s ᱠᱷᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱡᱤᱱᱤᱥ ᱵᱟᱰᱟᱭ ᱢᱮ ᱾</string>
 
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">ᱟᱨᱦᱚᱸ ᱵᱤᱵᱨᱚᱬ ᱞᱟᱹᱜᱤᱫ ᱱᱚᱰᱮ ᱚᱛᱟᱭ ᱢᱮᱸ</string>
+
     <!-- Deprecated: No Open Tabs Message Header -->
     <string name="no_collections_header1">ᱚᱱᱟ ᱡᱤᱱᱤᱥ ᱠᱚ ᱡᱟᱨᱣᱟᱭ ᱢᱮ ᱡᱟ ᱟᱢ ᱢᱮᱴᱚᱨ ᱢᱤᱭᱟ</string>
     <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d10fc67cc..147628560 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -215,6 +215,8 @@
     <string name="search_suggestions_onboarding_learn_more_link">Več o tem</string>
 
     <!-- Search Widget -->
+    <!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
+    <string name="search_widget_content_description">Odpri nov zavihek v Firefoxu</string>
     <!-- Text preview for smaller sized widgets -->
     <string name="search_widget_text_short">Iskanje</string>
     <!-- Text preview for larger sized widgets -->
@@ -631,6 +633,8 @@
 
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">Odpri zavihke</string>
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">Ime zbirke</string>
     <!-- Text for the menu button to remove a top site -->
     <string name="remove_top_site">Odstrani</string>
 
@@ -1632,6 +1636,9 @@
     The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="onboarding_firefox_account_header">Kar najbolje izkoristite %s.</string>
 
+    <!-- Content description radio buttons with a link to more information -->
+    <string name="radio_preference_info_content_description">Kliknite za podrobnosti</string>
+
     <!-- Deprecated: No Open Tabs Message Header -->
     <string name="no_collections_header1">Zbirajte stvari, ki vam kaj pomenijo</string>
     <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index cc139c87c..caa71691a 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -288,6 +288,8 @@
     <string name="preferences_theme">Téma</string>
     <!-- Preference for customizing the home screen -->
     <string name="preferences_home">Tepas</string>
+    <!-- Preference for gestures based actions -->
+    <string name="preferences_gestures">Réngkak</string>
     <!-- Preference for settings related to visual options -->
     <string name="preferences_customize">Sesuaikeun</string>
     <!-- Preference description for banner about signing in -->
@@ -324,6 +326,8 @@
     <!-- Preference title for switch preference to suggest bookmarks when searching -->
     <string name="preferences_search_bookmarks">Paluruh markah</string>
 
+    <!-- Preference title for switch preference to suggest synced tabs when searching -->
+    <string name="preferences_search_synced_tabs">Paluruh tab anu singkron</string>
     <!-- Preference for account settings -->
     <string name="preferences_account_settings">Setélan akun</string>
 
@@ -339,6 +343,21 @@
     <!-- Preference for notifications -->
     <string name="preferences_notifications">Iber</string>
 
+    <!-- Add-on Preferences -->
+    <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
+    <string name="preferences_customize_amo_collection">Koléksi Émboh sakahayang</string>
+    <!-- Button caption to confirm the add-on collection configuration -->
+    <string name="customize_addon_collection_ok">Heug</string>
+    <!-- Button caption to abort the add-on collection configuration -->
+    <string name="customize_addon_collection_cancel">Bolay</string>
+    <!-- Hint displayed on input field for custom collection name -->
+    <string name="customize_addon_collection_hint">Ngaran koléksi</string>
+    <!-- Hint displayed on input field for custom collection user ID-->
+    <string name="customize_addon_collection_user_hint">Pamilik koléksi (Sandiasma)</string>
+
+    <!-- Toast shown after confirming the custom add-on collection configuration -->
+    <string name="toast_customize_addon_collection_done">Koléksi Émboh geus dirobah. Kaluar ti aplikasi pikeun nerapkeun parobahan…</string>
+
     <!-- Account Preferences -->
     <!-- Preference for triggering sync -->
     <string name="preferences_sync_now">Singkronkeun ayeuna</string>
@@ -520,6 +539,15 @@
     <!-- Recently closed tabs screen message when there are no recently closed tabs -->
     <string name="recently_closed_empty_message">Taya tab nu anyar ditutup di dieu</string>
 
+    <!-- Tab Management -->
+    <!-- Title of preference for tabs management -->
+    <string name="preferences_tabs">Tab</string>
+    <!-- Title of preference that allows a user to specify the tab view -->
+    <string name="preferences_tab_view">Panémbong tab</string>
+    <!-- Option for a list tab view -->
+    <string name="tab_view_list">Béréndélan</string>
+    <!-- Option for a grid tab view -->
+    <string name="tab_view_grid">Grid</string>
     <!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
     <string name="preferences_close_tabs">Tutup tab</string>
     <!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
@@ -596,6 +624,8 @@
     <string name="collection_rename">Ganti ngaran koléksi</string>
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">Buka tab</string>
+    <!-- Hint for adding name of a collection -->
+    <string name="collection_name_hint">Ngaran koléksi</string>
     <!-- Text for the menu button to remove a top site -->
     <string name="remove_top_site">Piceun</string>
     <!-- Text for the menu button to delete a top site from history -->
@@ -634,6 +664,10 @@
         is a digit showing the number of items you have selected -->
     <string name="history_delete_some">Hapus %1$d item</string>
 
+    <!-- Text for the header that groups the history for today -->
+    <string name="history_today">Poé ieu</string>
+    <!-- Text for the header that groups the history for yesterday -->
+    <string name="history_yesterday">Kamari</string>
     <!-- Text for the header that groups the history for last 24 hours -->
     <string name="history_24_hours">24 jam terakhir</string>
 
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
new file mode 100644
index 000000000..aaafc7e0d
--- /dev/null
+++ b/app/src/main/res/values-tl/strings.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_5">Pribado %s</string>
+    <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
+    <string name="app_name_private_4">%s (Pribado)</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Pangalan</string>
+
+    <!-- Text for the negative button -->
+    <string name="cfr_neg_button_text">Salamat na lang</string>
+
+    <!-- Text for the negative button -->
+    <string name="search_widget_cfr_neg_button_text">Hindi ngayon</string>
+
+    <!-- Content description (not visible, for screen readers etc.): Navigate backward (browsing history) -->
+    <string name="browser_menu_back">Bumalik</string>
+    <!-- Content description (not visible, for screen readers etc.): Stop loading current website -->
+    <string name="browser_menu_stop">Tumigil</string>
+    <!-- Content description (not visible, for screen readers etc.): Bookmark the current page -->
+    <string name="browser_menu_bookmark">Bookmark</string>
+    <!-- Browser menu button that opens the addon manager -->
+    <string name="browser_menu_add_ons">Mga Add-on</string>
+    <!-- Browser menu button that sends a user to help articles -->
+    <string name="browser_menu_help">Tulong</string>
+    <!-- Browser menu button that sends a to a the what's new article -->
+    <string name="browser_menu_whats_new">Ano ang Bago</string>
+    <!-- Browser menu button that opens the settings menu -->
+    <string name="browser_menu_settings">Mga Setting</string>
+    <!-- Browser menu button that opens a user's library -->
+    <string name="browser_menu_library">Library</string>
+    <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. -->
+    <string name="browser_menu_install_on_homescreen">i-Install</string>
+    <!-- Browser menu button that creates a private tab -->
+    <string name="browser_menu_private_tab">Pribadong tab</string>
+    <!-- Browser menu button that creates a new tab -->
+    <string name="browser_menu_new_tab">Bagong tab</string>
+    <!-- Browser menu button that open a share menu to share the current site -->
+    <string name="browser_menu_share">Ibahagi</string>
+    <!-- Share menu title, displayed when a user is sharing their current site -->
+    <string name="menu_share_with">Ibahagi sa…</string>
+
+    <!-- Content description for search icon -->
+    <string name="a11y_search_icon_content_description">Hanapin</string>
+
+    <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_allow_button">Payagan</string>
+    <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
+    <string name="search_suggestions_onboarding_do_not_allow_button">Huwag Payagan</string>
+
+    <!-- Preference linking to help about Fenix -->
+    <string name="preferences_help">Tulong</string>
+    <!-- Preference for changing where the toolbar is positioned -->
+    <string name="preferences_toolbar">Toolbar</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">Tema</string>
+    <!-- Preference for customizing the home screen -->
+    <string name="preferences_home">Home</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name">Firefox Account</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">Wika</string>
+
+    </resources>
diff --git a/l10n.toml b/l10n.toml
index 6c3cd22a4..840b4e636 100644
--- a/l10n.toml
+++ b/l10n.toml
@@ -75,7 +75,7 @@ locales = [
   "rm",
   "ro",
   "ru",
-  "sat-Olck",
+  "sat",
   "sk",
   "sl",
   "sq",

From 424370a364c4fedf7011b37931c73f61ebff4aa2 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 12 Nov 2020 12:01:54 -0500
Subject: [PATCH 4/7] For #14772: Crash in Downloads (#16531)

Co-authored-by: Kate Glazko kglazko@mozilla.com
---
 .../org/mozilla/fenix/library/downloads/DownloadFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
index 95effa563..486bcf613 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
@@ -42,7 +42,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
                 it.value.id.toString(),
                 it.value.fileName,
                 it.value.filePath,
-                it.value.contentLength.toString(),
+                it.value.contentLength?.toString() ?: "0",
                 it.value.contentType,
                 it.value.status
             )

From 5441935698f4d9e3606f3d6baf892f6e0106a2f6 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 12 Nov 2020 12:59:31 -0500
Subject: [PATCH 5/7] Update to Android-Components 63.0.8 (#16532)

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

diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 209e0d7a0..ee3afa0ec 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "63.0.7"
+    const val VERSION = "63.0.8"
 }

From d999e29d1530fdb45ca7398badf8075d9a256123 Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Sat, 14 Nov 2020 20:02:15 -0500
Subject: [PATCH 6/7] Update A-C to 63.0.9 (#16578)

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

diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index ee3afa0ec..441eab57f 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "63.0.8"
+    const val VERSION = "63.0.9"
 }

From 0c69f4b5803ffa6eedd40893fe8f1d58defab9a3 Mon Sep 17 00:00:00 2001
From: Adam Novak <interfect@gmail.com>
Date: Sat, 28 Nov 2020 22:10:00 -0800
Subject: [PATCH 7/7] Drop exception stubs because GeckoView now drags in the
 conflicting real ones

---
 .../GooglePlayServicesNotAvailableException.java     | 12 ------------
 .../GooglePlayServicesRepairableException.java       | 10 ----------
 2 files changed, 22 deletions(-)
 delete mode 100644 app/src/main/java/com/google/android/gms/common/GooglePlayServicesNotAvailableException.java
 delete mode 100644 app/src/main/java/com/google/android/gms/common/GooglePlayServicesRepairableException.java

diff --git a/app/src/main/java/com/google/android/gms/common/GooglePlayServicesNotAvailableException.java b/app/src/main/java/com/google/android/gms/common/GooglePlayServicesNotAvailableException.java
deleted file mode 100644
index d401bd931..000000000
--- a/app/src/main/java/com/google/android/gms/common/GooglePlayServicesNotAvailableException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package com.google.android.gms.common;
-
-public class GooglePlayServicesNotAvailableException extends Exception {
-
-    public GooglePlayServicesNotAvailableException(int arg1) {
-    }
-
-}
diff --git a/app/src/main/java/com/google/android/gms/common/GooglePlayServicesRepairableException.java b/app/src/main/java/com/google/android/gms/common/GooglePlayServicesRepairableException.java
deleted file mode 100644
index 5786ca212..000000000
--- a/app/src/main/java/com/google/android/gms/common/GooglePlayServicesRepairableException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package com.google.android.gms.common;
-
-public class GooglePlayServicesRepairableException extends Exception {
-    public GooglePlayServicesRepairableException(int arg1, String arg2, Object arg3) {
-    }
-}