Copione merged onto master

app/build.gradle

@@ -167,7 +167,7 @@ android {
             setIgnore true
         }
 
-        if (buildType.name == 'fenixProduction' && flavors.contains("geckonightly")) {
+        if (buildType.name == 'fenixProduction' && flavors.contains("geckobeta")) {
             setIgnore true
         }
 

app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt

@@ -422,7 +422,7 @@ class BookmarksTest {
     }
 
     @Test
-    fun multipleBookmarkDeletions() {
+    fun multipleBookmarkDeletionsTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {
@@ -527,7 +527,7 @@ class BookmarksTest {
     }
 
     @Test
-    fun verifyCloseMenu() {
+    fun verifyCloseMenuTest() {
         homeScreen {
         }.openThreeDotMenu {
         }.openBookmarks {

app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt

@@ -11,7 +11,6 @@ import org.mozilla.fenix.helpers.HomeActivityTestRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
-import org.junit.Ignore
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.ui.robots.PRIVATE_SESSION_MESSAGE
@@ -117,7 +116,6 @@ class HomeScreenTest {
         }
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun privateModeScreenItemsTest() {
         homeScreen { }.dismissOnboarding()

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt

@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
 import org.junit.Rule
 import org.junit.Before
 import org.junit.After
-import org.junit.Ignore
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -70,7 +69,6 @@ class SettingsAboutTest {
 
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun verifyAboutFirefoxPreview() {
         homeScreen {

app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt

@@ -9,7 +9,6 @@ import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -23,7 +22,6 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
  * These tests will verify different functionalities of the app as a way to quickly detect regressions in main areas
  */
 
-@Ignore("Temp disable for triggering a native Gecko crash - https://github.com/mozilla-mobile/fenix/issues/11642")
 class SmokeTest {
     private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
     private lateinit var mockWebServer: MockWebServer

app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt

@@ -8,7 +8,6 @@ import androidx.test.platform.app.InstrumentationRegistry
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.ext.settings
@@ -157,7 +156,6 @@ class StrictEnhancedTrackingProtectionTest {
         }
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun testStrictVisitDisableExceptionToggle() {
         val trackingProtectionTest =

app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt

@@ -10,7 +10,6 @@ import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
@@ -53,7 +52,6 @@ class ThreeDotMenuMainTest {
         mockWebServer.shutdown()
     }
 
-    @Ignore("Instrumentation crash: https://github.com/mozilla-mobile/fenix/issues/11642")
     @Test
     fun threeDotMenuItemsTest() {
         homeScreen {

app/src/fenixProduction/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        package="org.mozilla.fenix">
+
+    <application>
+
+        <service android:name=".customtabs.CustomTabsService">
+            <!-- Trusted Web Activities are currently only supported in nightly. -->
+            <intent-filter tools:node="removeAll" />
+            <intent-filter>
+                <action android:name="android.support.customtabs.action.CustomTabsService" />
+                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+</manifest>

app/src/fenixProduction/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <color name="ic_launcher_background">@color/nightly_launcher_background</color>
+</resources>

app/src/fenixProduction/res/values/static_strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <!-- Name of the application -->
+    <string name="app_name" translatable="false">Firefox Nightly</string>
+</resources>

app/src/fenixProduction/res/xml/shortcuts.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="open_new_tab"
+        android:enabled="true"
+        android:icon="@drawable/ic_static_shortcut_tab"
+        android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"
+        android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
+        <intent
+            android:action="org.mozilla.fenix.OPEN_TAB"
+            android:targetPackage="org.mozilla.fenix"
+            android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="open_new_private_tab"
+        android:enabled="true"
+        android:icon="@drawable/ic_static_shortcut_private_tab"
+        android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"
+        android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
+        <intent
+            android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
+            android:targetPackage="org.mozilla.fenix"
+            android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
+    </shortcut>
+</shortcuts>

app/src/fennecBeta/res/values/static_strings.xml

@@ -4,5 +4,5 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
     <!-- Name of the application -->
-    <string name="app_name" translatable="false">Firefox</string>
+    <string name="app_name" translatable="false">Firefox Beta</string>
 </resources>

app/src/main/java/org/mozilla/fenix/Config.kt

@@ -52,6 +52,7 @@ enum class ReleaseChannel {
             FenixNightly -> true
             FennecNightly -> true
             FenixDebug -> true
+            FenixProduction -> true
             else -> false
         }
 

app/src/main/java/org/mozilla/fenix/FeatureFlags.kt

@@ -10,11 +10,6 @@ object FeatureFlags {
      */
     const val pullToRefreshEnabled = false
 
-    /**
-     * Enables tip feature
-     */
-    val tips = Config.channel.isDebug
-
     /**
      * Allows edit of saved logins.
      */
@@ -29,10 +24,4 @@ object FeatureFlags {
      * Enables new tab tray pref
      */
     val tabTray = Config.channel.isNightlyOrDebug
-
-    /**
-     * Allows search widget CFR to be displayed.
-     * This is a placeholder for the experimentation framework determining cohorts.
-     */
-    val searchWidgetCFR = Config.channel.isDebug
 }

app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt

@@ -4,8 +4,6 @@
 
 package org.mozilla.fenix.components.tips
 
-import org.mozilla.fenix.FeatureFlags
-
 sealed class TipType {
     data class Button(val text: String, val action: () -> Unit) : TipType()
 }
@@ -31,7 +29,6 @@ class FenixTipManager(
     private val providers: List<TipProvider>
 ) : TipManager {
     override fun getTip(): Tip? {
-        if (!FeatureFlags.tips) { return null }
         return providers
             .firstOrNull { it.shouldDisplay }
             ?.tip

app/src/main/res/values-be/strings.xml

@@ -1041,6 +1041,11 @@
     <!-- Add button text for the Add to Homescreen dialog -->
     <string name="add_to_homescreen_add">Дадаць</string>
 
+    <!-- Continue to website button text for the first-time Add to Homescreen dialog -->
+    <string name="add_to_homescreen_continue">Перайсці на вэб-сайт</string>
+    <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_text_placeholder">Назва ярлыка</string>
+
     <!-- Preference for managing the settings for logins and passwords in Fenix -->
     <string name="preferences_passwords_logins_and_passwords">Лагіны і паролі</string>
     <!-- Preference for managing the saving of logins and passwords in Fenix -->
@@ -1080,6 +1085,10 @@
     <string name="preferences_passwords_saved_logins_username">Імя карыстальніка</string>
     <!-- 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>
+    <!-- Message displayed in security prompt to access saved logins -->
+    <string name="preferences_passwords_saved_logins_enter_pin_description">Разблакуйце, каб пабачыць захаваныя лагіны</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>
 

app/src/main/res/values-cy/strings.xml

@@ -805,7 +805,7 @@
     <!-- Text shown in snackbar when user closes all tabs -->
     <string name="snackbar_tabs_closed">Tab wedi’i gau</string>
     <!-- Text shown in snackbar when user adds a site to top sites -->
-    <string name="snackbar_added_to_top_sites">Ychwanegwyd at y gwefannau gorau!</string>
+    <string name="snackbar_added_to_top_sites">Ychwanegwyd at fy hoff wefannau!</string>
     <!-- Text shown in snackbar when user closes a private tab -->
     <string name="snackbar_private_tab_closed">Tab preifat wedi’i gau</string>
 
@@ -884,8 +884,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Yn dileu data pori’n awtomatig  pan fyddwch yn dewis &quot;Gadael&quot; o’r brif ddewislen</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">Yn dileu data pori’n awtomatig  pan fyddwch yn dewis \&quot;Gadael\&quot; o’r brif ddewislen</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Hanes pori</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Gadael</string>
 

app/src/main/res/values-es/strings.xml

@@ -16,14 +16,17 @@
     <!-- Placeholder text shown in the search bar before a user enters text -->
     <string name="search_hint">Buscar o ingresar dirección</string>
 
-    <!-- No Open Tabs Message Header -->
-    <string name="no_open_tabs_header_2">No hay pestañas abiertas</string>
     <!-- No Open Tabs Message Description -->
     <string name="no_open_tabs_description">Las pestañas abiertas aparecerán aquí.</string>
 
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Tus pestañas privadas se mostrarán aquí.</string>
 
+    <!-- Message announced to the user when tab tray is selected with 1 tab -->
+    <string name="open_tab_tray_single">1 pestaña abierta. Tocar para cambiar de pestaña.</string>
+    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
+    <string name="open_tab_tray_plural">%1$s pestañas abiertas. Tocar para cambiar de pestaña.</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s es producido por Mozilla.</string>
 
@@ -298,7 +301,7 @@
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Inicios de sesión</string>
     <!-- Preference for syncing tabs -->
-    <string name="preferences_sync_tabs">Pestañas</string>
+    <string name="preferences_sync_tabs_2">Pestañas abiertas</string>
     <!-- Preference for signing out -->
     <string name="preferences_sign_out">Cerrar sesión</string>
     <!-- Preference displays and allows changing current FxA device name -->
@@ -487,7 +490,7 @@
     <!-- Open tabs menu item to share all tabs -->
     <string name="tabs_menu_share_tabs">Compartir pestañas</string>
     <!-- Open tabs menu item to save tabs to collection -->
-    <string name="tabs_menu_save_to_collection">Guardar en la colección</string>
+    <string name="tabs_menu_save_to_collection1">Guardar pestañas en la colección</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
     <string name="tab_menu">Menú de pestañas</string>
     <!-- Tab menu item to share the tab -->
@@ -704,17 +707,15 @@
     <string name="delete_browsing_data_quit_off">Desactivado</string>
 
     <!-- Collections -->
-    <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="collections_description">Guarda las cosas que te importan. Para empezar, guarda las pestañas abiertas en una nueva colección.</string>
     <!-- Collections header on home fragment -->
     <string name="collections_header">Colecciones</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
     <string name="collection_menu_button_content_description">Menú de la colección</string>
-    <!-- No Open Tabs Message Header -->
-    <string name="no_collections_header">No hay colecciones</string>
-    <!-- No Open Tabs Message Description -->
-    <string name="no_collections_description">Tus colecciones aparecerán aquí.</string>
 
+    <!-- No Open Tabs Message Header -->
+    <string name="no_collections_header1">Colecciona las cosas que te importan</string>
+    <!-- Label to describe what collections are to a new user without any collections -->
+    <string name="no_collections_description1">Agrupar búsquedas, sitios y pestañas similares para acceder rápidamente más tarde.</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Seleccionar pestañas</string>
 
@@ -914,8 +915,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Eliminar automáticamente los datos de navegación cuando selecciones &quot;Salir&quot; en el menú principal</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">Eliminar automáticamente los datos de navegación cuando selecciones  \&quot;Salir\&quot; en el menú principal</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Historial de navegación</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Salir</string>
 
@@ -939,8 +938,9 @@
     <!-- text for firefox preview moving tip description -->
     <string name="tip_firefox_preview_moved_description">Firefox Nightly se actualiza todas las noches y tiene nuevas funciones experimentales.
         Sin embargo, puede ser menos estable. Descarga nuestro navegador beta para una experiencia más estable.</string>
-    <!-- text for firefox preview moving tip button. "Mozilla Firefox Browser" is intentionally hardcoded -->
+
-    <string name="tip_firefox_preview_moved_button">Obtén el navegador Mozilla Firefox</string>
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">Obtener Firefox para Android Beta</string>
 
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly se movió</string>
@@ -1449,6 +1449,9 @@
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
     <string name="voice_search_explainer">Habla ahora</string>
 
+    <!--  The error message in edit login view when a duplicate username exists. -->
+    <string name="saved_login_duplicate">Ya existe un inicio de sesión con ese nombre de usuario</string>
+
     <!-- Synced Tabs -->
     <!-- Text displayed when user is not logged into a Firefox Account -->
     <string name="synced_tabs_connect_to_sync_account">Conectarse con una cuenta de Firefox.</string>
@@ -1458,5 +1461,19 @@
     <string name="synced_tabs_reauth">Por favor, vuelve a autentificarte.</string>
     <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
     <string name="synced_tabs_enable_tab_syncing">Por favor, activa la sincronización de pestañas.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">No tienes ninguna pestaña abierta en Firefox en tus otros dispositivos.</string>
+    <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
+    <string name="synced_tabs_sign_in_message">Ver una lista de pestañas de tus otros dispositivos.</string>
+    <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
+    <string name="synced_tabs_sign_in_button">Iniciar sesión para sincronizar</string>
+
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_title">Límite de sitios frecuentes alcanzado</string>
+    <!-- Content description text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_content">Para añadir un nuevo sitio frecuente, elimina uno. Mantén presionado el sitio y selecciona eliminar.</string>
+    <!-- Confirmation dialog button text when top sites limit is reached. -->
+    <string name="top_sites_max_limit_confirmation_button">Vale, entendido</string>
 
 </resources>

app/src/main/res/values-is/strings.xml

@@ -13,14 +13,17 @@
     <string name="content_description_disable_private_browsing_button">Afvirkja huliðsvöfrun</string>
     <!-- Placeholder text shown in the search bar before a user enters text -->
     <string name="search_hint">Leitaðu eða sláðu inn vistfang</string>
-    <!-- No Open Tabs Message Header -->
-    <string name="no_open_tabs_header_2">Engir opnir flipar</string>
     <!-- No Open Tabs Message Description -->
     <string name="no_open_tabs_description">Opnu fliparnir þínir verða sýndir hér.</string>
 
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Opnu einkafliparnir þínir verða sýndir hér.</string>
 
+    <!-- Message announced to the user when tab tray is selected with 1 tab -->
+    <string name="open_tab_tray_single">1 opinn flipi. Snertu til að skipta um flipa.</string>
+    <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
+    <string name="open_tab_tray_plural">%1$s opnir flipar. Snertu til að skipta um flipa.</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s er framleitt af Mozilla.</string>
 
@@ -105,8 +108,6 @@
     <string name="browser_menu_new_tab">Nýr flipi</string>
     <!-- Browser menu button that saves the current tab to a collection -->
     <string name="browser_menu_save_to_collection_2">Vista í safn</string>
-    <!-- Browser menu button that opens a dialog to report issues with the current site -->
-    <string name="browser_menu_report_issue">Viltu láta vita af veseni á vefsvæði</string>
     <!-- Browser menu button that open a share menu to share the current site -->
     <string name="browser_menu_share">Deila</string>
     <!-- Share menu title, displayed when a user is sharing their current site -->
@@ -121,8 +122,10 @@
     <!-- Browser menu text shown in custom tabs to indicate this is a Fenix tab
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
     <string name="browser_menu_powered_by2">Knúið af %1$s</string>
-    <!-- Browser menu button to put the the current page in reader mode -->
+    <!-- Browser menu button to put the current page in reader mode -->
     <string name="browser_menu_read">Leshamur</string>
+    <!-- Browser menu button content description to close reader mode and return the user to the regular browser -->
+    <string name="browser_menu_read_close">Loka lesham</string>
     <!-- Browser menu button to open the current page in an external app -->
     <string name="browser_menu_open_app_link">Opna í smáforriti</string>
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
@@ -293,7 +296,7 @@
     <!-- Preference for syncing logins -->
     <string name="preferences_sync_logins">Innskráningar</string>
     <!-- Preference for syncing tabs -->
-    <string name="preferences_sync_tabs">Flipar</string>
+    <string name="preferences_sync_tabs_2">Opnir flipar</string>
     <!-- Preference for signing out -->
     <string name="preferences_sign_out">Útskráning</string>
     <!-- Preference displays and allows changing current FxA device name -->
@@ -450,6 +453,24 @@
     <string name="tabs_header_private_tabs_title">Huliðsflipar</string>
     <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
     <string name="add_tab">Bæta við flipa</string>
+    <!-- Content description (not visible, for screen readers etc.): Add tab button. Adds a news tab when pressed -->
+    <string name="add_private_tab">Bæta við einkaflipa</string>
+    <!-- Text for the new tab button to indicate adding a new private tab in the tab -->
+    <string name="tab_drawer_fab_content">Einka</string>
+    <!-- Text shown as the title of the open tab tray -->
+    <string name="tab_tray_title">Opnir flipar</string>
+    <!-- Text shown in the menu for saving tabs to a collection -->
+    <string name="tab_tray_menu_item_save">Vista í safn</string>
+    <!-- Text shown in the menu for sharing all tabs -->
+    <string name="tab_tray_menu_item_share">Deila flipum</string>
+    <!-- Text shown in the menu for closing all tabs -->
+    <string name="tab_tray_menu_item_close">Loka öllum flipum</string>
+    <!-- Shortcut action to open new tab -->
+    <string name="tab_tray_menu_open_new_tab">Nýr flipi</string>
+    <!-- Shortcut action to open the home screen -->
+    <string name="tab_tray_menu_home">Á upphafsreit</string>
+    <!-- Shortcut action to toggle private mode -->
+    <string name="tab_tray_menu_toggle">Skiptu um flipa</string>
     <!-- Content description (not visible, for screen readers etc.): Removes tab from collection button. Removes the selected tab from collection when pressed -->
     <string name="remove_tab_from_collection">Fjarlæga flipann úr safni</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
@@ -464,7 +485,7 @@
     <!-- Open tabs menu item to share all tabs -->
     <string name="tabs_menu_share_tabs">Deila flipum</string>
     <!-- Open tabs menu item to save tabs to collection -->
-    <string name="tabs_menu_save_to_collection">Vista í safn</string>
+    <string name="tabs_menu_save_to_collection1">Vista flipa í safn</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
     <string name="tab_menu">Valmynd flipa</string>
     <!-- Tab menu item to share the tab -->
@@ -675,16 +696,14 @@
     <string name="delete_browsing_data_quit_off">Óvirkt</string>
 
     <!-- Collections -->
-    <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="collections_description">Safna því sem skiptir þig máli. Þú getur byrjað á því að vista opna flipa í nýtt safn.</string>
     <!-- Collections header on home fragment -->
     <string name="collections_header">Söfn</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the collection menu when pressed -->
     <string name="collection_menu_button_content_description">Valmynd safns</string>
     <!-- No Open Tabs Message Header -->
-    <string name="no_collections_header">Engin söfn</string>
+    <string name="no_collections_header1">Safnaðu því sem skiptir þig máli</string>
-    <!-- No Open Tabs Message Description -->
+    <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description">Söfnin þín birtast hér.</string>
+    <string name="no_collections_description1">Hópaðu saman svipaðar leitir, síður og flipa svo auðvelt sé að opna seinna.</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Veldu flipa</string>
     <!-- Title for the "select collection" step of the collection creator -->
@@ -714,6 +733,9 @@
     <!-- Button to save currently selected tabs in the "select tabs" step of the collection creator-->
     <string name="create_collection_save">Vista</string>
 
+    <!-- Snackbar action to view the collection the user just created or updated -->
+    <string name="create_collection_view">Skoða</string>
+
     <!-- Default name for a new collection in "name new collection" step of the collection creator. %d is a placeholder for the number of collections-->
     <string name="create_collection_default_name">Safn %d</string>
 
@@ -863,8 +885,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Eyðir vafragögnum sjálfvirkt þegar þú ýtir á &quot;Hætta&quot; í aðalvalmyndinni</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">Eyðir vafragögnum sjálfvirkt þegar þú ýtir á \&quot;Hætta\&quot; í aðalvalmyndinni</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Leitarsaga</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Hætta</string>
 
@@ -888,8 +908,9 @@
     <string name="tip_firefox_preview_moved_description">¶
  · Firefox Nightly er uppfærður á hverju kvöldi og er með virkni sem verið er að prófa sig áfram með.¶
  · Hins vegar gæti hann verið óstöðugari fyrir vikið. Sæktu betu útgáfu af vafranum ef þú vilt stöðugri vafra.</string>
-    <!-- text for firefox preview moving tip button. "Mozilla Firefox Browser" is intentionally hardcoded -->
+
-    <string name="tip_firefox_preview_moved_button">Sæktu Mozilla Firefox vafra</string>
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">Sækja Firefox fyrir Android, beta útgáfu</string>
 
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly er kominn á nýjan stað</string>
@@ -946,20 +967,20 @@
     <!-- text to display in the snackbar if automatic sign-in fails. user may try again -->
     <string name="onboarding_firefox_account_automatic_signin_failed">Innskráning mistókst</string>
     <!-- text for the tracking protection onboarding card header -->
-    <string name="onboarding_tracking_protection_header">Verndaðu sjálfan þig</string>
+    <string name="onboarding_tracking_protection_header_2">Sjálfvirkt næði</string>
     <!-- text for the tracking protection card description
     The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_tracking_protection_description1">%s hjálpar til við að hindra vefsíður í að rekja þig á netinu.</string>
+    <string name="onboarding_tracking_protection_description_2">Persónuverndar- og öryggisstillingar loka á rekjara, spilliforrit og fyrirtæki sem fylgja þér.</string>
     <!-- text for tracking protection radio button option for standard level of blocking -->
-    <string name="onboarding_tracking_protection_standard_button">Staðlað</string>
+    <string name="onboarding_tracking_protection_standard_button_2">Staðlað (sjálfgefið)</string>
     <!-- text for standard blocking option button description -->
-    <string name="onboarding_tracking_protection_standard_button_description">Hindrar færri rekjara en leyfir síðum að hlaðast eðlilega</string>
+    <string name="onboarding_tracking_protection_standard_button_description_2">Loka á færri rekjara. Síður hlaðast venjulega.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_button">Strangt (mælt með)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Strangt</string>
     <!-- text for strict blocking option button description -->
-    <string name="onboarding_tracking_protection_strict_button_description">Hindrar fleiri rekjara, sem veitir betri vörn, en gæti valdið því að sumar síður virka ekki eðlilega</string>
+    <string name="onboarding_tracking_protection_strict_button_description_2">Lokar á fleiri rekjara, auglýsingar og sprettiglugga. Síður hlaðast hraðar en sum virkni gæti verið í ólagi.</string>
     <!-- text for the toolbar position card header
         In English this is an idiom for "choose a side as in an argument or fight"
         but it is ok to make this more literally about "choosing a position in a physical space -->
@@ -1047,31 +1068,21 @@
     <!-- Text displayed that links to website about enhanced tracking protection -->
     <string name="preference_enhanced_tracking_protection_explanation_learn_more">Fræðast meira</string>
     <!-- Preference for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_option">Staðlað</string>
+    <string name="preference_enhanced_tracking_protection_standard_default_1">Staðlað (sjálfgefið)</string>
-    <!-- Preference for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard">Staðlað (mælt með)</string>
     <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description">Jöfn vernd og afköst .</string>
+    <string name="preference_enhanced_tracking_protection_standard_description_3">Loka á færri rekjara. Síður hlaðast venjulega.</string>
-    <!-- Preference description for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_standard_description_2">Síður hlaða venjulega en loka fyrir færri rekjara.</string>
     <!--  Accessibility text for the Standard protection information icon  -->
     <string name="preference_enhanced_tracking_protection_standard_info_button">Hvað er lokað af með staðlaðri rekjaravernd</string>
     <!-- Preference for enhanced tracking protection for the strict protection settings -->
     <string name="preference_enhanced_tracking_protection_strict">Strangt</string>
-    <!-- Preference for enhanced tracking protection for the strict protection settings, default setting -->
-    <string name="preference_enhanced_tracking_protection_strict_default">Strangt (sjálfgefið)</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_default_description">Sterkari rekjaravörn og hraðari afköst en sumar síður virka ef til vill ekki eðlilega</string>
+    <string name="preference_enhanced_tracking_protection_strict_description_2">Lokar á fleiri rekjara, auglýsingar og sprettiglugga. Síður hlaðast hraðar en sum virkni gæti verið í ólagi.</string>
-    <!-- Preference for enhanced tracking protection for the standard protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_recommended">Strangt (mælt með)</string>
-    <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_strict_description">Sterkari vernd en getur valdið því að sumar síður eða efni virki ekki.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_strict_info_button">Hvað er lokað af með strangari rekjaravernd</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom">Sérsniðið</string>
     <!-- Preference description for enhanced tracking protection for the strict protection settings -->
-    <string name="preference_enhanced_tracking_protection_custom_description">Veldu hvaða rekjara og forskriftir á að loka fyrir</string>
+    <string name="preference_enhanced_tracking_protection_custom_description_2">Veldu hvaða rekjara og forskriftir á að loka fyrir.</string>
     <!--  Accessibility text for the Strict protection information icon  -->
     <string name="preference_enhanced_tracking_protection_custom_info_button">Hvað er lokað á með sérsniðinni rekjaravernd</string>
     <!-- Header for categories that are being blocked by current Enhanced Tracking Protection settings -->
@@ -1121,7 +1132,7 @@
     <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_tracking_content_description">Stöðvar utanaðkomandi auglýsingar myndbönd og annað efni sem inniheldur kóða til að rekja hegðun frá því að hlaðast. Getur haft áhrif á virkni vefsetra.</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 name="etp_onboarding_message_2">%s hindrar rekjara á þessu vefsvæði þegar skjöldurinn er fjólublár. Snertu skjöldinn til að sjá hvað er lokað á.</string>
+    <string name="etp_onboarding_cfr_message">Í hvert skipti sem skjöldurinn er fjólublár þá hefur %s lokað fyrir rekjara á vefsetrinu. Snertu til að fá meiri upplýsingar.</string>
     <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
     <string name="etp_panel_on">Kveikt er á vörn fyrir þetta vefsvæði</string>
     <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
@@ -1408,6 +1419,9 @@
     <!-- Voice search prompt description displayed after the user presses the voice search button -->
     <string name="voice_search_explainer">Talaðu núna</string>
 
+    <!--  The error message in edit login view when a duplicate username exists. -->
+    <string name="saved_login_duplicate">Innskráning með þessu notandanafni er þegar til</string>
+
     <!-- Synced Tabs -->
     <!-- Text displayed when user is not logged into a Firefox Account -->
     <string name="synced_tabs_connect_to_sync_account">Tengjast við Firefox reikning.</string>
@@ -1417,5 +1431,19 @@
     <string name="synced_tabs_reauth">Vinsamlegast endurauðkenndu þig.</string>
     <!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
     <string name="synced_tabs_enable_tab_syncing">Vinsamlegast virkjaðu samstillingu flipa.</string>
+    <!-- Text displayed when user has no tabs that have been synced -->
+    <string name="synced_tabs_no_tabs">Þú ert ekki með neina Firefox flipa opna á hinum tækjunum þínum.</string>
+    <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
+    <string name="synced_tabs_sign_in_message">Skoða lista yfir flipa frá öðrum tækjum.</string>
+    <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
+    <string name="synced_tabs_sign_in_button">Skráðu þig inn til að samstilla</string>
+
+    <!-- Top Sites -->
+    <!-- Title text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_title">Ekki hægt að bæta fleiri vefsetrum við efstu vefsvæði</string>
+    <!-- Content description text displayed in the dialog when top sites limit is reached. -->
+    <string name="top_sites_max_limit_content">Fjarlægðu eina til að bæta við nýju efstu vefsvæði. Ýttu lengi á síðuna og veldu fjarlægja.</string>
+    <!-- Confirmation dialog button text when top sites limit is reached. -->
+    <string name="top_sites_max_limit_confirmation_button">Í lagi, ég skil</string>
 
 </resources>

app/src/main/res/values-sl/strings.xml

@@ -460,6 +460,10 @@
     <string name="tab_tray_menu_item_close">Zapri vse zavihke</string>
     <!-- Shortcut action to open new tab -->
     <string name="tab_tray_menu_open_new_tab">Nov zavihek</string>
+    <!-- Shortcut action to open the home screen -->
+    <string name="tab_tray_menu_home">Domov</string>
+    <!-- Shortcut action to toggle private mode -->
+    <string name="tab_tray_menu_toggle">Preklopi način zavihkov</string>
     <!-- Content description (not visible, for screen readers etc.): Removes tab from collection button. Removes the selected tab from collection when pressed -->
     <string name="remove_tab_from_collection">Odstrani zavihek iz zbirke</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
@@ -472,6 +476,8 @@
     <string name="tabs_menu_close_all_tabs">Zapri vse zavihke</string>
     <!-- Open tabs menu item to share all tabs -->
     <string name="tabs_menu_share_tabs">Deli zavihke</string>
+    <!-- Open tabs menu item to save tabs to collection -->
+    <string name="tabs_menu_save_to_collection1">Shrani zavihke v zbirko</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
     <string name="tab_menu">Meni zavihka</string>
     <!-- Tab menu item to share the tab -->
@@ -720,6 +726,9 @@
     <!-- Button to save currently selected tabs in the "select tabs" step of the collection creator-->
     <string name="create_collection_save">Shrani</string>
 
+    <!-- Snackbar action to view the collection the user just created or updated -->
+    <string name="create_collection_view">Prikaži</string>
+
     <!-- Default name for a new collection in "name new collection" step of the collection creator. %d is a placeholder for the number of collections-->
     <string name="create_collection_default_name">Zbirka %d</string>
 
@@ -895,6 +904,9 @@
     <string name="tip_firefox_preview_moved_description">Firefox Nightly se posodablja vsak dan in vsebuje poskusne nove možnosti.
         Njegovo delovanje je lahko nezanesljivo. Za zanesljivejše brskanje prenesite različico beta našega brskalnika.</string>
 
+    <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
+    <string name="tip_firefox_preview_moved_button_2">Prenesite Firefox za Android Beta</string>
+
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header_preview_installed">Firefox Nightly se je preselil</string>
     <!-- text for firefox preview moving tip description -->
@@ -1418,6 +1430,9 @@
     <!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
     <string name="synced_tabs_sign_in_message">Oglejte si seznam zavihkov drugih naprav.</string>
 
+    <!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
+    <string name="synced_tabs_sign_in_button">Prijava v Sync</string>
+
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">V redu, razumem</string>
 

app/src/main/res/values-tr/strings.xml

@@ -887,8 +887,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Ana menüden &quot;Çık&quot;ı seçtiğinizde gezinti verilerini otomatik olarak siler</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">Ana menüden \&quot;Çık\&quot;ı seçtiğinizde gezinti verilerini otomatik olarak siler</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Gezinti geçmişi</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Çık</string>
 
@@ -950,7 +948,7 @@
     <string name="onboarding_whats_new_description_linktext">Yanıtlar burada</string>
     <!-- text for the firefox account onboarding card header
     The first parameter is the name of the app (e.g. Firefox Preview) -->
-    <string name="onboarding_firefox_account_header">%s’dan en iyi şekilde yararlanın.</string>
+    <string name="onboarding_firefox_account_header">%s tarayıcınızdan en iyi şekilde yararlanın.</string>
     <!-- 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 -->

app/src/main/res/values-vi/strings.xml

@@ -157,7 +157,7 @@
     <!-- Header displayed when selecting a shortcut search engine -->
     <string name="search_shortcuts_search_with_2">Lần này, tìm kiếm với:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
-    <string name="awesomebar_clipboard_title">Điền liên kết từ clipboard</string>
+    <string name="awesomebar_clipboard_title">Điền liên kết từ bộ nhớ tạm</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
     <string name="search_suggestions_onboarding_allow_button">Cho phép</string>
     <!-- Button in the search suggestions onboarding that does not allow search suggestions in private sessions -->
@@ -271,7 +271,7 @@
     <!-- Preference title for switch preference to show search suggestions also in private mode -->
     <string name="preferences_show_search_suggestions_in_private">Hiển thị trong phiên riêng tư</string>
     <!-- Preference title for switch preference to show a clipboard suggestion when searching -->
-    <string name="preferences_show_clipboard_suggestions">Hiển thị đề xuất clipboard</string>
+    <string name="preferences_show_clipboard_suggestions">Hiển thị đề xuất bộ nhớ tạm</string>
     <!-- Preference title for switch preference to suggest browsing history when searching -->
     <string name="preferences_search_browsing_history">Tìm kiếm lịch sử duyệt web</string>
     <!-- Preference title for switch preference to suggest bookmarks when searching -->
@@ -882,8 +882,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Tự động xóa dữ liệu duyệt khi bạn chọn &quot;Thoát&quot; từ menu chính</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">Tự động xóa dữ liệu duyệt khi bạn chọn \&quot;Thoát\&quot; từ menu chính</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Lịch sử duyệt web</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Thoát</string>
 
@@ -1178,7 +1176,7 @@
     <!-- Paste the text in the clipboard -->
     <string name="browser_toolbar_long_press_popup_paste">Dán</string>
     <!-- Snackbar message shown after an URL has been copied to clipboard. -->
-    <string name="browser_toolbar_url_copied_to_clipboard_snackbar">Đã sao chép URL vào clipboard</string>
+    <string name="browser_toolbar_url_copied_to_clipboard_snackbar">Đã sao chép URL vào bộ nhớ tạm</string>
 
     <!-- Title text for the Add To Homescreen dialog -->
     <string name="add_to_homescreen_title">Thêm vào màn hình chính</string>
@@ -1253,11 +1251,11 @@
     <!-- Negative confirmation that Fenix should not save the new or updated login -->
     <string name="logins_doorhanger_save_dont_save">Không lưu</string>
     <!-- Shown in snackbar to tell user that the password has been copied -->
-    <string name="logins_password_copied">Đã sao chép mật khẩu vào clipboard</string>
+    <string name="logins_password_copied">Đã sao chép mật khẩu vào bộ nhớ tạm</string>
     <!-- Shown in snackbar to tell user that the username has been copied -->
-    <string name="logins_username_copied">Đã sao chép tên người dùng vào clipboard</string>
+    <string name="logins_username_copied">Đã sao chép tên người dùng vào bộ nhớ tạm</string>
     <!-- Shown in snackbar to tell user that the site has been copied -->
-    <string name="logins_site_copied">Đã sao chép URL trang web vào clipboard</string>
+    <string name="logins_site_copied">Đã sao chép trang web vào bộ nhớ tạm</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">Sao chép mật khẩu</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->

app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt

@@ -4,54 +4,12 @@
 
 package org.mozilla.fenix.components.tips
 
-import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkObject
-import io.mockk.unmockkObject
-import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
-import org.junit.Before
 import org.junit.Test
-import org.mozilla.fenix.FeatureFlags
 
 class TipManagerTest {
-
-    @Before
-    fun setup() {
-        mockkObject(FeatureFlags)
-        every { FeatureFlags.tips } returns true
-    }
-
-    @After
-    fun after() {
-        unmockkObject(FeatureFlags)
-    }
-
-    @Test
-    fun `test feature flag off`() {
-        every { FeatureFlags.tips } returns false
-        assertNull(FenixTipManager(emptyList()).getTip())
-        assertNull(FenixTipManager(listOf(
-            object : TipProvider {
-                override val tip = mockk<Tip>()
-                override val shouldDisplay = true
-            },
-            object : TipProvider {
-                override val tip = mockk<Tip>()
-                override val shouldDisplay = false
-            },
-            object : TipProvider {
-                override val tip: Tip? = null
-                override val shouldDisplay = true
-            },
-            object : TipProvider {
-                override val tip: Tip? = null
-                override val shouldDisplay = false
-            }
-        )).getTip())
-    }
-
     @Test
     fun `test first with shouldDisplay`() {
         val shouldDisplayProvider = object : TipProvider {

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 = "49.0.20200630133320"
+    const val VERSION = "49.0.20200701130905"
 }

taskcluster/ci/build/kind.yml

@@ -129,14 +129,15 @@ jobs:
         treeherder:
             symbol: beta(B)
 
+    # XXX `production` is now the new nightly. We keep this name around while we officially remove
+    # `nightly` and `fennec-nightly`
     production:
         attributes:
-            release-type: production
+            nightly: true
-        include-release-version: true
+        include-nightly-version: true
         include-shippable-secrets: true
-        filter-incomplete-translations: true
         run:
-            geckoview-engine: geckoBeta
+            geckoview-engine: geckoNightly
             gradle-build-type: fenixProduction
         run-on-tasks-for: [github-release]
         treeherder:

taskcluster/ci/mark-as-shipped/kind.yml

@@ -17,8 +17,8 @@ primary-dependency: push-apk
 group-by: build-type
 
 only-for-build-types:
-    - beta
+    - fenix-beta
-    - production
+    - fenix-production
 
 job-template:
     description: Mark Fenix as shipped in ship-it