From b7325a3833b68b915f189af15d3421c24acd3816 Mon Sep 17 00:00:00 2001
From: Elise Richards <erichards@mozilla.com>
Date: Mon, 27 Jul 2020 17:19:31 -0500
Subject: [PATCH 01/20] For #12571: Rename shortcuts to search engine on search
 screen (#12839)

* Rename shortcuts to search engine on search screen

* Remove deprecated pref key

* Re-add deprecated string
---
 .../mozilla/fenix/components/metrics/Metrics.kt  |  2 +-
 .../org/mozilla/fenix/search/SearchFragment.kt   | 12 ++++++------
 .../settings/search/SearchEngineFragment.kt      |  2 +-
 .../java/org/mozilla/fenix/utils/Settings.kt     |  2 +-
 app/src/main/res/layout/fragment_search.xml      | 16 ++++++++--------
 app/src/main/res/values/preference_keys.xml      |  3 +--
 app/src/main/res/values/strings.xml              | 12 +++++++-----
 app/src/main/res/values/styles.xml               |  2 +-
 app/src/main/res/xml/search_preferences.xml      |  2 +-
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
index 77a08ce20..22ec2e328 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
@@ -236,7 +236,7 @@ sealed class Event {
             context.getString(R.string.pref_key_search_bookmarks),
             context.getString(R.string.pref_key_search_browsing_history),
             context.getString(R.string.pref_key_show_clipboard_suggestions),
-            context.getString(R.string.pref_key_show_search_shortcuts),
+            context.getString(R.string.pref_key_show_search_engine_shortcuts),
             context.getString(R.string.pref_key_open_links_in_a_private_tab),
             context.getString(R.string.pref_key_sync_logins),
             context.getString(R.string.pref_key_sync_bookmarks),
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index f0ca9bff3..fb706bcda 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -268,7 +268,7 @@ class SearchFragment : Fragment(), UserInteractionHandler {
             qrFeature.get()?.scan(R.id.container)
         }
 
-        view.search_shortcuts_button.setOnClickListener {
+        view.search_engines_shortcut_button.setOnClickListener {
             searchInteractor.onSearchShortcutsButtonClicked()
         }
 
@@ -400,7 +400,7 @@ class SearchFragment : Fragment(), UserInteractionHandler {
     }
 
     private fun updateSearchWithLabel(searchState: SearchFragmentState) {
-        search_with_shortcuts.visibility =
+        search_engine_shortcut.visibility =
             if (searchState.showSearchShortcuts) View.VISIBLE else View.GONE
     }
 
@@ -450,19 +450,19 @@ class SearchFragment : Fragment(), UserInteractionHandler {
             findViewById<View>(R.id.search_suggestions_onboarding)?.isVisible = state.showSearchSuggestionsHint
 
             search_suggestions_onboarding_divider?.isVisible =
-                search_with_shortcuts.isVisible && state.showSearchSuggestionsHint
+                search_engine_shortcut.isVisible && state.showSearchSuggestionsHint
         }
     }
 
     private fun updateSearchShortcutsIcon(searchState: SearchFragmentState) {
         view?.apply {
-            search_shortcuts_button.isVisible = searchState.areShortcutsAvailable
+            search_engines_shortcut_button.isVisible = searchState.areShortcutsAvailable
 
             val showShortcuts = searchState.showSearchShortcuts
-            search_shortcuts_button.isChecked = showShortcuts
+            search_engines_shortcut_button.isChecked = showShortcuts
 
             val color = if (showShortcuts) R.attr.contrastText else R.attr.primaryText
-            search_shortcuts_button.compoundDrawables[0]?.setTint(
+            search_engines_shortcut_button.compoundDrawables[0]?.setTint(
                 requireContext().getColorFromAttr(color)
             )
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
index 954e31658..800bf05bc 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
@@ -38,7 +38,7 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
             }
 
         val showSearchShortcuts =
-            requirePreference<SwitchPreference>(R.string.pref_key_show_search_shortcuts).apply {
+            requirePreference<SwitchPreference>(R.string.pref_key_show_search_engine_shortcuts).apply {
                 isChecked = context.settings().shouldShowSearchShortcuts
             }
 
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 180b022a2..defa8901d 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -305,7 +305,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     )
 
     val shouldShowSearchShortcuts by booleanPreference(
-        appContext.getPreferenceKey(R.string.pref_key_show_search_shortcuts),
+        appContext.getPreferenceKey(R.string.pref_key_show_search_engine_shortcuts),
         default = false
     )
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index ebdc0bc21..9a6e5873b 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -52,7 +52,7 @@
                 android:fadingEdgeLength="40dp"
                 android:nestedScrollingEnabled="false"
                 android:requiresFadingEdge="vertical"
-                app:layout_constraintTop_toBottomOf="@id/search_with_shortcuts"
+                app:layout_constraintTop_toBottomOf="@id/search_engine_shortcut"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 mozac:awesomeBarDescriptionTextColor="?secondaryText"
@@ -139,8 +139,8 @@
                 app:layout_constraintTop_toBottomOf="@id/fill_link_from_clipboard" />
 
             <TextView
-                android:id="@+id/search_with_shortcuts"
-                style="@style/SearchShortcutsLabelStyle"
+                android:id="@+id/search_engine_shortcut"
+                style="@style/SearchEngineShortcutsLabelStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/search_fragment_shortcuts_label_margin_horizontal"
@@ -150,14 +150,14 @@
                 android:text="@string/search_engines_search_with"
                 app:layout_constraintStart_toStartOf="@id/scrollable_area"
                 app:layout_constraintTop_toBottomOf="@id/awesomeBar_barrier"
-                tools:text="This time, search with:" />
+                tools:text="@string/search_engines_search_with" />
 
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/awesomeBar_barrier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
-                app:constraint_referenced_ids="fill_link_from_clipboard,search_with_shortcuts,search_suggestions_onboarding" />
+                app:constraint_referenced_ids="fill_link_from_clipboard,search_engine_shortcut,search_suggestions_onboarding" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -195,10 +195,10 @@
             app:drawableStartCompat="@drawable/ic_qr" />
 
         <ToggleButton
-            android:id="@+id/search_shortcuts_button"
+            android:id="@+id/search_engines_shortcut_button"
             style="@style/search_pill"
-            android:textOff="@string/search_engines_shortcut_button"
-            android:textOn="@string/search_engines_shortcut_button"
+            android:textOff="@string/search_engine_button"
+            android:textOn="@string/search_engine_button"
             app:drawableStartCompat="@drawable/ic_search" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 125190f09..08f64e202 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -86,7 +86,7 @@
 
     <!-- Search Settings -->
     <string name="pref_key_search_engine_list" translatable="false">pref_key_search_engine_list</string>
-    <string name="pref_key_show_search_shortcuts" translatable="false">pref_key_show_search_shortcuts</string>
+    <string name="pref_key_show_search_engine_shortcuts" translatable="false">pref_key_show_search_engine_shortcuts</string>
     <string name="pref_key_show_search_suggestions" translatable="false">pref_key_show_search_suggestions</string>
     <string name="pref_key_show_clipboard_suggestions" translatable="false">pref_key_show_clipboard_suggestions</string>
     <string name="pref_key_search_browsing_history" translatable="false">pref_key_search_browsing_history</string>
@@ -95,7 +95,6 @@
     <string name="pref_key_show_search_suggestions_in_private_onboarding" translatable="false">pref_key_show_search_suggestions_in_privateonboarding</string>
     <string name="pref_key_show_voice_search" translatable="false">pref_key_show_voice_search</string>
 
-
     <!-- Site Permissions Settings -->
     <string name="pref_key_optimize" translatable="false">pref_key_optimize</string>
     <string name="pref_key_show_site_exceptions" translatable="false">pref_key_show_site_exceptions</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04601fc28..e14bfecf9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -167,8 +167,8 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scan</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_engines_shortcut_button">Search Engine</string>
+    <!-- Button in the search view that lets a user change their search engine -->
+    <string name="search_engine_button">Search engine</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">Search engine settings</string>
     <!-- Header displayed when selecting a shortcut search engine -->
@@ -1456,12 +1456,14 @@
     <string name="top_sites_max_limit_confirmation_button">OK, Got It</string>
 
     <!-- DEPRECATED STRINGS -->
-    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <!-- DEPRECATED: Button in the search view that lets a user search by using a shortcut -->
     <string name="search_shortcuts_button">Shortcuts</string>
     <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
     <string name="search_shortcuts_search_with">Search with</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
     <string name="search_shortcuts_search_with_2">This time, search with:</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
+    <!-- DEPRECATED: Preference title for switch preference to show search shortcuts -->
     <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
+    <!-- DEPRECATED: Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_engines_shortcut_button">Search Engine</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f370730f1..6b675efc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -455,7 +455,7 @@
         <item name="android:elevation">0dp</item>
     </style>
 
-    <style name="SearchShortcutsLabelStyle">
+    <style name="SearchEngineShortcutsLabelStyle">
         <item name="android:fontFamily">@font/metropolis_semibold</item>
         <item name="android:letterSpacing">0.15</item>
         <item name="android:textAllCaps">true</item>
diff --git a/app/src/main/res/xml/search_preferences.xml b/app/src/main/res/xml/search_preferences.xml
index 5c6d3939b..d892037e0 100644
--- a/app/src/main/res/xml/search_preferences.xml
+++ b/app/src/main/res/xml/search_preferences.xml
@@ -26,7 +26,7 @@
         android:layout="@layout/preference_cat_style">
         <SwitchPreference
             android:defaultValue="true"
-            android:key="@string/pref_key_show_search_shortcuts"
+            android:key="@string/pref_key_show_search_engine_shortcuts"
             android:title="@string/preferences_show_search_engines" />
         <SwitchPreference
             android:defaultValue="true"

From 0657bf41d34f97c0d456d7f5c71c52f1e4171598 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 27 Jul 2020 14:19:36 -0400
Subject: [PATCH 02/20] For #12991 - Set height to recommended touch target
 size for collect button

---
 app/src/main/res/layout/component_tabstray.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 3dd4f2ae0..b90dcea71 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -79,7 +79,7 @@
         <TextView
             android:id="@+id/collect_multi_select"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="48dp"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="16dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
@@ -95,9 +95,9 @@
             app:drawableStartCompat="@drawable/ic_tab_collection"
             app:drawableTint="@color/contrast_text_normal_theme"
             app:fontFamily="@font/metropolis_medium"
-            app:layout_constraintBottom_toBottomOf="@id/multiselect_title"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/multiselect_title" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"

From 33db252797921c68861e0963c6c05d6dd57124dd Mon Sep 17 00:00:00 2001
From: Mozilla L10n Automation Bot <release+l10n-automation-bot@mozilla.com>
Date: Tue, 28 Jul 2020 00:23:55 +0000
Subject: [PATCH 03/20] Import l10n.

---
 app/src/main/res/values-be/strings.xml     | 23 +++---
 app/src/main/res/values-br/strings.xml     | 37 +++++++--
 app/src/main/res/values-co/strings.xml     | 39 +++++++---
 app/src/main/res/values-cs/strings.xml     | 27 +++----
 app/src/main/res/values-cy/strings.xml     | 27 ++++---
 app/src/main/res/values-de/strings.xml     | 47 ++++++++++--
 app/src/main/res/values-dsb/strings.xml    | 26 +++++++
 app/src/main/res/values-en-rCA/strings.xml | 47 ++++++++++--
 app/src/main/res/values-en-rGB/strings.xml | 39 +++++++---
 app/src/main/res/values-es-rAR/strings.xml | 49 ++++++++++--
 app/src/main/res/values-fi/strings.xml     | 37 ++++++---
 app/src/main/res/values-fr/strings.xml     | 41 +++++++---
 app/src/main/res/values-fy-rNL/strings.xml | 21 ++++--
 app/src/main/res/values-gn/strings.xml     | 39 +++++++---
 app/src/main/res/values-hr/strings.xml     | 37 +++++++--
 app/src/main/res/values-hsb/strings.xml    | 26 +++++++
 app/src/main/res/values-hu/strings.xml     | 21 ++++--
 app/src/main/res/values-hy-rAM/strings.xml | 37 +++++++--
 app/src/main/res/values-it/strings.xml     | 23 ++++--
 app/src/main/res/values-iw/strings.xml     | 42 +++++++++--
 app/src/main/res/values-ka/strings.xml     | 41 +++++++---
 app/src/main/res/values-kab/strings.xml    | 21 ++++--
 app/src/main/res/values-kk/strings.xml     | 21 ++++--
 app/src/main/res/values-ko/strings.xml     | 88 +++++++++++++++-------
 app/src/main/res/values-lo/strings.xml     | 51 ++++++++++---
 app/src/main/res/values-lt/strings.xml     | 25 +++---
 app/src/main/res/values-nb-rNO/strings.xml | 23 +++++-
 app/src/main/res/values-nl/strings.xml     | 21 ++++--
 app/src/main/res/values-nn-rNO/strings.xml |  6 ++
 app/src/main/res/values-oc/strings.xml     | 39 ++++++++--
 app/src/main/res/values-pt-rBR/strings.xml | 21 ++++--
 app/src/main/res/values-pt-rPT/strings.xml | 34 +++++++--
 app/src/main/res/values-ro/strings.xml     | 87 ++++++++++++++++-----
 app/src/main/res/values-ru/strings.xml     | 37 +++++++--
 app/src/main/res/values-sk/strings.xml     | 39 +++++++---
 app/src/main/res/values-sq/strings.xml     | 39 +++++++---
 app/src/main/res/values-su/strings.xml     | 37 +++++++--
 app/src/main/res/values-sv-rSE/strings.xml | 16 ++++
 app/src/main/res/values-te/strings.xml     | 27 +++++--
 app/src/main/res/values-tr/strings.xml     | 37 +++++++--
 app/src/main/res/values-trs/strings.xml    | 35 ++++++---
 app/src/main/res/values-uk/strings.xml     | 26 +++++++
 app/src/main/res/values-uz/strings.xml     | 87 +++++++++++++++++++--
 app/src/main/res/values-vi/strings.xml     | 21 ++++--
 app/src/main/res/values-zh-rCN/strings.xml | 25 +++---
 app/src/main/res/values-zh-rTW/strings.xml | 21 ++++--
 46 files changed, 1239 insertions(+), 371 deletions(-)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index e7fd6f1fa..7aece74fa 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -128,14 +128,8 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканаваць</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Цэтлікі</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">Налады пошукавых сістэм</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Шукаць з</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Гэтым разам шукаць у:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Уставіць спасылку з буфера абмену</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -238,8 +232,6 @@
     <string name="developer_tools_category">Прылады распрацоўшчыка</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Аддаленая адладка праз USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Пошукавыя скароты</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Паказваць пошукавыя прапановы</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -336,6 +328,8 @@
     <!-- Preference for account login -->
     <string name="preferences_sync_sign_in">Увайсці</string>
 
+    <!-- Preference for reconnecting to FxA sync -->
+    <string name="preferences_sync_sign_in_to_reconnect">Увайдзіце, каб злучыцца зноў</string>
     <!-- Preference for removing FxA account -->
     <string name="preferences_sync_remove_account">Выдаліць уліковы запіс</string>
 
@@ -585,7 +579,7 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s выдалена</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Закладкі выдалены</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">АДМЯНІЦЬ</string>
@@ -1279,4 +1273,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, зразумела</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Цэтлікі</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Шукаць з</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Гэтым разам шукаць у:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Пошукавыя скароты</string>
+    </resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 6c0ea763f..0dd1ea902 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -142,13 +142,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Cʼhwilerviñ</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Berradennoù</string>
+    <string name="search_engines_shortcut_button">Lusker klask</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">Arventennoù al lusker klask</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Klask gant</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Evit ar wech-mañ, klask gant:</string>
+    <string name="search_engines_search_with">Ar wech-mañ, klask gant:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Leuniañ diwar ar golver</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -255,8 +253,8 @@
     <string name="developer_tools_category">Ostilhoù an diorroer</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Diveugañ a-bell dre USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Berradennoù klask</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Diskouez al luskerioù klask</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Diskouez kinnigoù ar cʼhlask</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -566,6 +564,8 @@
     <string name="bookmark_select_folder">Dibab un teuliad</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Ha fellout a ra deocʼh dilemel an teuliad-mañ ?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s a zilamo an elfennoù diuzet</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Dilamet %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -620,8 +620,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Dilamet %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Dilamet eo bet ar sined</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">O tilemel an teuliadoù diuzet</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">DIZOBER</string>
 
@@ -715,6 +717,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d ivinell diuzet</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Ivinelloù enrollet!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Dastumad enrollet!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Ivinell enrollet!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -818,6 +822,10 @@
     <string name="qr_scanner_dialog_negative">NACʼHAÑ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Sur ocʼh e fell deocʼh dilemel %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Dilemel an ivinell-mañ a zilamo an dastumad a-bezh. Gallout a rit krouiñ dastumadoù nevez pa fell deoc’h.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Dilemel %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Dilemel</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1214,6 +1222,8 @@
     <string name="preferences_passwords_exceptions_description_empty">An titouroù kennaskañ n’int ket enrollet a vo diskouezet amañ.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Ne vo ket enrollet an titouroù kennaskañ evit al lec’hiennoù-mañ.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Dilemel an holl nemedennoù</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Klask titouroù kennaskañ</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1253,6 +1263,8 @@
     <string name="saved_login_copy_username">Eilañ an anv arveriad</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Eilañ al lec’hienn</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Digeriñ al lec’hienn er merdeer</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Diskouez ar ger-tremen</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1425,4 +1437,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Mat, komprenet am eus</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Berradennoù</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Klask gant</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Evit ar wech-mañ, klask gant:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Berradennoù klask</string>
+    </resources>
diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml
index bc67d7ddd..2eb2af110 100644
--- a/app/src/main/res/values-co/strings.xml
+++ b/app/src/main/res/values-co/strings.xml
@@ -151,13 +151,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Numerizà</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Accurtatoghji</string>
+    <string name="search_engines_shortcut_button">Mutore di ricerca</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">Preferenze di u mutore di ricerca</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Circà cù</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Per sta volta, circà cù :</string>
+    <string name="search_engines_search_with">Per sta volta, circà cù :</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Riempie da u preme’papei</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -265,8 +263,8 @@
     <string name="developer_tools_category">Attrezzi di sviluppu</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Spannatura alluntanata via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Affissà l’accurtatoghji di ricerca</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Affissà i mutori di ricerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Affissà e suggestioni di ricerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -580,6 +578,8 @@
     <string name="bookmark_select_folder">Selezziunà un cartulare</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Site sicuru di vulè squassà stu cartulare ?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s squasserà l’elementi selezziunati.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s squassatu</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -636,8 +636,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s squassatu</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Indette squassate</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Squassatura di i cartulari selezziunati</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ABBANDUNÀ</string>
 
@@ -732,6 +734,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d unghjetta selezziunata</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Unghjette arregistrate !</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Cullezzione arregistrata !</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Unghjetta arregistrata !</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -836,6 +840,10 @@
     <string name="qr_scanner_dialog_negative">RICUSÀ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Site sicuru di vulè squassà %1$s ?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">A squassatura di st’unghjetta squasserà a cullezzione sana. Pudete creà nove cullezzioni à ogni mumentu.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Squassà %1$s ?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Squassà</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -890,8 +898,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Squassa autumaticamente i dati di navigazione quandu vi selezziunate « Esce » in u listinu principale</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">Squassa autumaticamente i dati di navigazione quandu vi selezziunate « Esce » in u listinu principale</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">Crunulogia di navigazione</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Esce</string>
 
@@ -1240,6 +1246,8 @@
     <string name="preferences_passwords_exceptions_description_empty">L’identificazioni è parolle d’entrata chì ùn sò micca arregistrate seranu affissate quì.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">L’identificazioni è parolle d’entrata ùn seranu micca arregistrate per sti siti.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Squassà tutte l’eccezzioni</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Circà identificazioni di cunnessione</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1280,6 +1288,8 @@
     <string name="saved_login_copy_username">Cupià u nome d’utilizatore</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Cupià u situ</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Apre u situ in u navigatore</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Affissa a parolla d’entrata</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1458,4 +1468,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Iè, aghju capitu</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Accurtatoghji</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Circà cù</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Per sta volta, circà cù :</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Affissà l’accurtatoghji di ricerca</string>
+    </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 576655c9a..f266d3ab8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -151,14 +151,8 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Naskenovat</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Zkratky</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">Nastavení vyhledávače</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Vyhledat pomocí</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Vyhledat pomocí:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Vložit odkaz ze schránky</string>
 
@@ -230,7 +224,7 @@
     <!-- Preference for allowing screenshots to be taken while in a private tab-->
     <string name="preferences_allow_screenshots_in_private_mode">Povolit pořizování snímků obrazovky v anonymním prohlížení</string>
     <!-- Preference for adding private browsing shortcut -->
-    <string name="preferences_add_private_browsing_shortcut">Přidat anonymní prohlížení na plochu</string>
+    <string name="preferences_add_private_browsing_shortcut">Vytvořit zkratku pro anonymní prohlížení</string>
     <!-- Preference for accessibility -->
     <string name="preferences_accessibility">Přístupnost</string>
     <!-- Preference to override the Firefox Account server -->
@@ -267,8 +261,6 @@
     <string name="developer_tools_category">Nástroje pro vývojáře</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Vzdálené ladění pomocí USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Zobrazit zkratky vyhledávání</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Našeptávat vyhledávání</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -388,7 +380,7 @@
     <!-- Header of the Turn on Sync preference view -->
     <string name="preferences_sync">Zapnout synchronizaci</string>
     <!-- Preference for pairing -->
-    <string name="preferences_sync_pair">Naskenujte párovací kód zobrazený ve Firefoxu na počítači</string>
+    <string name="preferences_sync_pair">Naskenovat párovací kód zobrazený ve Firefoxu na počítači</string>
     <!-- Preference for account login -->
     <string name="preferences_sync_sign_in">Přihlásit se</string>
     <!-- Preference for reconnecting to FxA sync -->
@@ -649,7 +641,7 @@
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Záložka odstraněna: %1$s</string>
 
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Záložky smazány</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ZPĚT</string>
@@ -994,7 +986,7 @@
     <!-- text for standard blocking option button description -->
     <string name="onboarding_tracking_protection_standard_button_description_2">Blokuje méně sledovacích prvků. Stránky se načítají běžným způsobem.</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
-    <string name="onboarding_tracking_protection_strict_button">Striktní (doporučeno)</string>
+    <string name="onboarding_tracking_protection_strict_button">Přísná (doporučeno)</string>
     <!-- text for tracking protection radio button option for strict level of blocking -->
     <string name="onboarding_tracking_protection_strict_option">Přísná</string>
     <!-- text for strict blocking option button description -->
@@ -1464,4 +1456,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, rozumím</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Zkratky</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Vyhledat pomocí</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Vyhledat pomocí:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Zobrazit zkratky vyhledávání</string>
+    </resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 422797ffb..78f8fb1a3 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -147,13 +147,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Sganio</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Llwybrau byr</string>
+    <string name="search_engines_shortcut_button">Peiriant Chwilio</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">Gosodiadau peiriannau chwilio</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Chwilio gyda</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Y tro hwn, chwilio gyda:</string>
+    <string name="search_engines_search_with">Y tro hwn, chwilio gyda:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Llanw’r ddolen o’r clipfwrdd</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +259,8 @@
     <string name="developer_tools_category">Offer datblygwyr</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Dadfygio pell drwy USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Dangos llwybrau byr chwilio</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Dangos y peiriannau chwilio</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Dangos awgrymiadau chwilio</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -706,7 +704,7 @@
     <!-- No Open Tabs Message Header -->
     <string name="no_collections_header1">Casglwch y pethau sy’n bwysig i chi</string>
     <!-- Label to describe what collections are to a new user without any collections -->
-    <string name="no_collections_description1">Grwpiwch chwiliadau, gwefannau a thabiau tebyg ar gyfer mynediad cyflym yn nes ymlaen.</string>
+    <string name="no_collections_description1">Grwpiwch chwiliadau, gwefannau a thabiau tebyg ar gyfer mynediad cyflym yn y dyfodol.</string>
     <!-- Title for the "select tabs" step of the collection creator -->
     <string name="create_collection_select_tabs">Dewis Tabiau</string>
     <!-- Title for the "select collection" step of the collection creator -->
@@ -916,10 +914,10 @@
 
     <!-- text for firefox preview moving tip description -->
     <string name="tip_firefox_preview_moved_description">Mae Firefox Nightly yn cael ei ddiweddaru bob nos ac mae ganddo nodweddion newydd arbrofol.
-Fodd bynnag, gall fod yn llai sefydlog. Llwythwch ein porwr beta i gael profiad mwy sefydlog.</string>
+Fodd bynnag, gall fod yn llai sefydlog. Llwythwch ein porwr Beta i gael profiad mwy cadarn.</string>
 
     <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
-    <string name="tip_firefox_preview_moved_button_2">Estyn Firefox ar gyfer Android Beta</string>
+    <string name="tip_firefox_preview_moved_button_2">Estyn Firefox Android Beta</string>
 
     <!-- text for firefox preview moving tip header. "Firefox Nightly" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header_preview_installed">Mae Firefox Nightly wedi symud</string>
@@ -1455,4 +1453,13 @@ Fodd bynnag, gall fod yn llai sefydlog. Llwythwch ein porwr beta i gael profiad
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Iawn, Wedi deall!</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Llwybrau byr</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Chwilio gyda</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Y tro hwn, chwilio gyda:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Dangos llwybrau byr chwilio</string>
+    </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c2c3ec46a..7ee372f8e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,6 +27,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s offene Tabs. Antippen, um  Tabs zu wechseln.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d ausgewählt</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Neue Sammlung hinzufügen</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Name</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Sammlung auswählen</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Mehrfachauswahl-Modus beenden</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Ausgewählte Tabs in Sammlung speichern</string>
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s ausgewählt</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s abgewählt</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Mehrfachauswahl-Modus beendet</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Mehrfachauswah-Modus aktiviert, wählen Sie Tabs zum Speichern in einer Sammlung</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Ausgewählt</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s wird von Mozilla hergestellt.</string>
 
@@ -153,13 +176,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannen</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Suchmaschinen</string>
+    <string name="search_engines_shortcut_button">Suchmaschine</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">Suchmaschinen-Einstellungen</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Suchen mit</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Einmalig suchen mit:</string>
+    <string name="search_engines_search_with">Einmalig suchen mit:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Link aus Zwischenablage einfügen</string>
 
@@ -268,8 +289,8 @@
     <string name="developer_tools_category">Entwicklerwerkzeuge</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Externes Debugging über USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Kürzel für die Suche anzeigen</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Suchmaschinen anzeigen</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Suchvorschläge anzeigen</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -522,6 +543,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (Privater Modus)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Speichern</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Chronik löschen</string>
@@ -1489,4 +1513,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Ok, verstanden</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Suchmaschinen</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Suchen mit</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Einmalig suchen mit:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Kürzel für die Suche anzeigen</string>
+    </resources>
diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml
index b9013af97..4b95de4b1 100644
--- a/app/src/main/res/values-dsb/strings.xml
+++ b/app/src/main/res/values-dsb/strings.xml
@@ -24,6 +24,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">Wócynjone rejtariki: %1$s. Pótusniśo, aby rejtariki pśešaltował.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">Wubrane: %1$d</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Nowu zběrku pśidaś</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Mě</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Zběrku wubraś</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Wěcejwuběrański modus spušćiś</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Wubrane rejtariki do zběrki składowaś</string>
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s wubrany</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s wěcej njewubrany</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Wěcejwuběrański modus jo se spušćił</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Wěcejwuběrański modus jo se zmóžnił, wubjeŕśo rejtariki, aby je do zběrki składował</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Wubrany</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s se pśez Mozilla zgótujo.</string>
 
@@ -510,6 +533,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (priwatny modus)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Składowaś</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Historiju wulašowaś</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 29a9b6b6c..2428be270 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -25,6 +25,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s open tabs. Tap to switch tabs.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d selected</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Add new collection</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Name</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Select collection</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Exit multiselect mode</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Save selected tabs to collection</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">Selected %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">Unselected %1$s</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Exited multiselect mode</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Entered multiselect mode, select tabs to save to a collection</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Selected</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s is produced by Mozilla.</string>
 
@@ -148,13 +171,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scan</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Shortcuts</string>
+    <string name="search_engines_shortcut_button">Search Engine</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">Search engine settings</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Search with</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">This time, search with:</string>
+    <string name="search_engines_search_with">This time, search with:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Fill link from clipboard</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +282,8 @@
     <string name="developer_tools_category">Developer tools</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Show search engines</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Show search suggestions</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -508,6 +529,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (Private Mode)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Save</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Delete history</string>
@@ -1446,4 +1470,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, Got It</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Shortcuts</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Search with</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">This time, search with:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
+    </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index dafb0d979..57ccf4222 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -147,13 +147,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scan</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Shortcuts</string>
+    <string name="search_engines_shortcut_button">Search Engine</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">Search engine settings</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Search with</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">This time, search with:</string>
+    <string name="search_engines_search_with">This time, search with:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Fill link from clipboard</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +259,8 @@
     <string name="developer_tools_category">Developer tools</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Show search engines</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Show search suggestions</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -573,6 +571,8 @@
     <string name="bookmark_select_folder">Select folder</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Are you sure you want to delete this folder?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s will delete the selected items.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Deleted %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -627,8 +627,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Deleted %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Bookmarks deleted</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Deleting selected folders</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">UNDO</string>
 
@@ -722,6 +724,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d tab selected</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Tabs saved!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Collection saved!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Tab saved!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -826,6 +830,10 @@
     <string name="qr_scanner_dialog_negative">DENY</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Are you sure you want to delete %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Deleting this tab will delete the entire collection. You can create new collections at any time.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Delete %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Delete</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -880,8 +888,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Automatically deletes browsing data when you select &quot;Quit&quot; from the main menu</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">Automatically deletes browsing data when you select \&quot;Quit\&quot; from the main menu</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">Browsing history</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Quit</string>
 
@@ -1224,6 +1230,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Logins and passwords that are not saved will be shown here.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Logins and passwords will not be saved for these sites.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Delete all exceptions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Search logins</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1262,6 +1270,8 @@
     <string name="saved_login_copy_username">Copy username</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Copy site</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Open site in browser</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Show password</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1435,4 +1445,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, Got It</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Shortcuts</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Search with</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">This time, search with:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
+    </resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 4f578f553..a610d0c58 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -25,6 +25,29 @@
     <!-- 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. Tocá para cambiar de pestaña.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">Se seleccionó %1$d</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Agregar colección nueva</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Nombre</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">Salir del modo de selección múltiple</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Guardar pestañas seleccionadas en la 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">Se seleccionó %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">Se eliminó la selección %1$s</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Salió del modo de selección múltiple</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Ingresó al modo de selección múltiple, seleccione pestañas para guardar en una 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">Seleccionadas</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>
 
@@ -151,13 +174,11 @@
     <!-- 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 search by using a shortcut -->
-    <string name="search_shortcuts_button">Atajos</string>
+    <string name="search_engines_shortcut_button">Buscador</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 del buscador</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Buscar con</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Esta vez buscar con:</string>
+    <string name="search_engines_search_with">Esta vez buscar con:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Completar enlace desde el portapapeles</string>
 
@@ -267,8 +288,8 @@
     <string name="developer_tools_category">Herramientas de desarrollador</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuración remota vía USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Mostrar atajos de teclado para búsquedas</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Mostrar buscadores</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugerencias de búsqueda</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -527,6 +548,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (modo privado)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Guardar</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Eliminar historial</string>
@@ -592,7 +616,7 @@
     <!-- Screen title for selecting a bookmarks folder -->
     <string name="bookmark_select_folder">Seleccionar carpeta</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
-    <string name="bookmark_delete_folder_confirmation_dialog">¿Estás seguro de que querés eliminar eliminar esta carpeta?</string>
+    <string name="bookmark_delete_folder_confirmation_dialog">¿Estás seguro de que querés eliminar esta carpeta?</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
     <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s va a eliminar los elementos seleccionados.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
@@ -1477,4 +1501,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Listo, lo entendí.</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Atajos</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Buscar con</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Esta vez buscar con:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Mostrar atajos de teclado para búsquedas</string>
+    </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 31c621bdb..3a0bd05a6 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -151,13 +151,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skannaa</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Oikopolut</string>
+    <string name="search_engines_shortcut_button">Hakukone</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">Hakukoneasetukset</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Hae hakukoneella</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Tällä kertaa käytä hakuun:</string>
+    <string name="search_engines_search_with">Tällä kertaa käytä hakuun:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Täytä linkki leikepöydältä</string>
 
@@ -267,8 +265,8 @@
     <string name="developer_tools_category">Kehittäjätyökalut</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Etävianjäljitys USB:n kautta</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Näytä hakuoikopolut</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Näytä hakukoneet</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Näytä hakuehdotukset</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -585,6 +583,8 @@
     <string name="bookmark_select_folder">Valitse kansio</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Haluatko varmasti poistaa tämän kansion?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s poistaa valitut kohteet.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s poistettu</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -640,8 +640,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Poistettu %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Kirjanmerkit poistettu</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Poistetaan valitut kansiot</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">KUMOA</string>
 
@@ -736,6 +738,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d välilehti valittu</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Välilehdet tallennettu!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Kokoelma tallennettu!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Välilehti tallennettu!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -841,6 +845,8 @@
     <string name="qr_scanner_dialog_negative">ESTÄ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Poistetaanko %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Poistetaanko %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Poista</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -899,8 +905,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Poistaa automaattisesti selaustiedot, kun valitset &quot;Lopeta&quot; päävalikosta</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">Poistaa automaattisesti selaustiedot, kun valitset \&quot;Lopeta\&quot; päävalikosta</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">Selaushistoria</string>
 
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Lopeta</string>
@@ -1247,6 +1251,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Käyttäjätunnukset ja salanat, joita ei tallenneta, näytetään täällä.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Käyttäjätunnuksia ja salasanoja ei tallenneta näille sivustoille.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Poista kaikki poikkeukset</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Etsi kirjautumistiedoista</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1285,6 +1291,8 @@
     <string name="saved_login_copy_username">Kopioi käyttäjätunnus</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Kopioi sivusto</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Avaa sivusto selaimessa</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Näytä salasana</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1460,4 +1468,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Selvä</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Oikopolut</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Hae hakukoneella</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Tällä kertaa käytä hakuun:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Näytä hakuoikopolut</string>
+    </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9ec476c7b..9a397b014 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -150,14 +150,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanner</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Raccourcis</string>
+    <string name="search_engines_shortcut_button">Moteur de recherche</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">Paramètres du moteur de recherche</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Rechercher avec</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Pour cette fois, rechercher avec :</string>
+    <string name="search_engines_search_with">Pour cette fois-ci, rechercher avec :</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Remplir depuis le presse-papiers</string>
 
@@ -266,8 +263,8 @@
     <string name="developer_tools_category">Outils de développement</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Débogage distant par USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Afficher les raccourcis de recherche</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Afficher les moteurs de recherche</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Afficher les suggestions de recherche</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -588,6 +585,8 @@
     <string name="bookmark_select_folder">Sélectionner un dossier</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Voulez-vous vraiment supprimer ce dossier ?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s supprimera les éléments sélectionnés.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s supprimé</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -643,8 +642,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s supprimé</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Marque-pages supprimés</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Suppression des dossiers sélectionnés</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ANNULER</string>
 
@@ -749,6 +750,8 @@
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Onglets enregistrés !</string>
 
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Collection enregistrée !</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Onglet enregistré !</string>
 
@@ -860,6 +863,10 @@
     <string name="qr_scanner_dialog_negative">REFUSER</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Voulez-vous vraiment supprimer %1$s ?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">La suppression de cet onglet supprimera toute la collection. Vous pouvez créer de nouvelles collections à tout moment.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Supprimer %1$s ?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Supprimer</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -918,8 +925,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Supprime automatiquement les données de navigation lorsque vous sélectionnez « Quitter » dans le menu 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">Supprime automatiquement les données de navigation lorsque vous sélectionnez « Quitter » dans le menu 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">Historique de navigation</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Quitter</string>
 
@@ -1267,6 +1272,8 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <string name="preferences_passwords_exceptions_description_empty">Les identifiants et les mots de passe qui ne sont pas enregistrés seront affichés ici.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Les identifiants et les mots de passe ne seront pas enregistrés pour ces sites.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Supprimer toutes les exceptions</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Rechercher des identifiants</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1305,6 +1312,8 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <string name="saved_login_copy_username">Copier le nom d’utilisateur</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Copier le site</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Ouvrir le site dans le navigateur</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Afficher le mot de passe</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1478,4 +1487,14 @@ Cependant, il peut être moins stable. Téléchargez la version bêta de notre n
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">J’ai compris</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Raccourcis</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Rechercher avec</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Pour cette fois, rechercher avec :</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Afficher les raccourcis de recherche</string>
+    </resources>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 42b5bfb19..520f356bb 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -151,13 +151,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanne</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Fluchkeppelingen</string>
+    <string name="search_engines_shortcut_button">Sykmasine</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">Ynstellingen sykmasine</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Sykje mei</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Diskear sykje mei:</string>
+    <string name="search_engines_search_with">Diskear sykje mei:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Keppeling fan klamboerd ôf ynfolje</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -264,8 +262,8 @@
     <string name="developer_tools_category">Untwikkelersark</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging fia USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Sykfluchkeppelingen toane</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Sykmasinen toane</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Syksuggesjes toane</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1457,4 +1455,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, begrepen</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Fluchkeppelingen</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Sykje mei</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Diskear sykje mei:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Sykfluchkeppelingen toane</string>
+    </resources>
diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml
index c23fe2606..d7c545640 100644
--- a/app/src/main/res/values-gn/strings.xml
+++ b/app/src/main/res/values-gn/strings.xml
@@ -153,13 +153,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Moha’ãnga</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Mbopya’eha</string>
+    <string name="search_engines_shortcut_button">Hekaha mongu’eha</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">Hekaha ñemboheko</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Eheka amo</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Ko’ág̃a, eheka hendive:</string>
+    <string name="search_engines_search_with">Ko’ág̃a, eheka hendive:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Emoĩmba juajuha kuatiajokoha guive</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -267,8 +265,8 @@
     <string name="developer_tools_category">Mboguatahára rembipuru</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Ñemopotĩ okayguáva USB rupi</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Ehechauka jeheka mbopya’eha</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Ehechauka hekaha mongu’eha</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Ehechauka ñemoñe’ẽ jehekarã</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -586,6 +584,8 @@
 
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">¿Añetehápepa emboguetese ko marandurenda?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s omboguéta umi mba’epuru poravopyre.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Mboguepyre %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -641,8 +641,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Emboguete %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Techaukaha mboguepyre</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Embogue marandurenda poravopyre</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">MBOGUEVI</string>
 
@@ -738,6 +740,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d tendayke poravopyre</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">¡Tendayke ñongatupyre!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Ñembyaty ñongatupyre</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">¡Tendayke ñongatupyre!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -847,6 +851,10 @@
     <string name="qr_scanner_dialog_negative">MBOTOVE</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">¿Emboguetesépa añetehápe %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Emboguetévo ko tendayke omboguéta opaite mbyatypyre. Emoheñoikuaa mbyatypyre pyahu ejapose vove.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">¿Emboguete %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Mboguete</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -902,8 +910,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Embogue ijehegui kundahára mba’ekuaarã eiporavóvo &quot;Ñesẽ&quot; pe jeporavorã guasúpe</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">Embogue ijehegui kundahára mba’ekuaarã eiporavóvo &quot;Ñesẽ&quot; pe jeporavorã guasúpe</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">Kundahára rembiasakue</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Ñesẽ</string>
 
@@ -1256,6 +1262,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Ápe ojehecháta tembiapo ñepyrũ ha ñe’ẽñemi oñeñongatu’ỹva.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Noñeñongatumo’ãi tembiapo ñepyrũ ha ñe’ẽñemi ko’ã tendápe g̃uarã.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Emboguete opaite oĩ’ỹva</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Eheka tembiapo ñepyrũ</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1294,6 +1302,8 @@
     <string name="saved_login_copy_username">Emonguatia puruhára réra</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Emonguatia tenda</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Embojuruja tenda kundahárape</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Ehechauka ñe’ẽñemi</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1472,4 +1482,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Oĩma, aikumby</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Mbopya’eha</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Eheka amo</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Ko’ág̃a, eheka hendive:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Ehechauka jeheka mbopya’eha</string>
+    </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1ad6ea0e7..95f1bc3c0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -147,13 +147,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skeniraj</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Prečaci</string>
+    <string name="search_engines_shortcut_button">Tražilica</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">Traži postavke tražilice</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Traži pomoću</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Ovaj put traži pomoću:</string>
+    <string name="search_engines_search_with">Ovaj puta pretražuj s:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Umetni poveznicu iz međuspremnika</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +259,8 @@
     <string name="developer_tools_category">Alati za programere</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Daljinsko uklanjanje grešaka putem USB-a</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Prikaži prečace za pretraživanje</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Prikaži tražilice</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Prikaži prijedloge za pretraživanje</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -582,6 +580,8 @@
     <string name="bookmark_select_folder">Odaberi mapu</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Stvarno želiš izbrisati ovu mapu?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s će obrisati odabrane stavke.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Izbrisano: %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -637,8 +637,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Izbrisano: %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Zabilješke izbrisane</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Brisanje odabranih mapa</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">PONIŠTI</string>
 
@@ -733,6 +735,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d kartica odabrana</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Kartice su spremljene!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Zbirka spremljena!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Kartica je spremljena!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -838,6 +842,10 @@
     <string name="qr_scanner_dialog_negative">ZABRANI</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Sigurno želiš izbrisati %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Brisanjem ove kartice obrisat ćete cijelu zbirku. Možete napraviti novu zbirku u bilo koje vrijeme.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Obriši %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Izbriši</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1240,6 +1248,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Ovdje će se prikazati prijave i lozinke koje nisu spremljene.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Prijave i lozinke neće se spremiti za te web-stanice.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Obriši sve iznimke</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Traži prijave</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1278,6 +1288,8 @@
     <string name="saved_login_copy_username">Kopiraj korisničko ime</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Kopiraj web-stranicu</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Otvori stranicu u pregledniku</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Prikaži lozinku</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1457,4 +1469,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">U redu, shvaćam</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Prečaci</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Traži pomoću</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Ovaj put traži pomoću:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Prikaži prečace za pretraživanje</string>
+    </resources>
diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml
index d2ed79c9f..94089fe56 100644
--- a/app/src/main/res/values-hsb/strings.xml
+++ b/app/src/main/res/values-hsb/strings.xml
@@ -24,6 +24,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">Wočinjene rajtarki: %1$s. Podótkńće so, zo byšće rajtarki přepinał.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">Wubrane: %1$d</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Nowu zběrku přidać</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Mjeno</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Zběrku wubrać</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Wjacewuběranski modus wopušćić</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Wubrane rajtarki do zběrki składować</string>
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s wubrany</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s hižo njewubrany</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Wjacewuběranski modus je so wopušćił</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Wjacewuběranski modus je so zmóžnił, wubjerće rajtarki, zo byšće je do zběrki składował</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Wubrany</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s so přez Mozilla zhotowja.</string>
 
@@ -511,6 +534,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (priwatny modus)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Składować</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Historiju zhašeć</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 34b10de40..baff20113 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -150,13 +150,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Beolvasás</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Gyorsbillentyűk</string>
+    <string name="search_engines_shortcut_button">Keresőszolgáltatás</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">Keresőszolgáltatás-beállítások</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Keresés ezzel:</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Ezúttal keressen a következővel:</string>
+    <string name="search_engines_search_with">Ezúttal keressen a következővel:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Hivatkozás kitöltése a vágólapról</string>
 
@@ -264,8 +262,8 @@
     <string name="developer_tools_category">Fejlesztői eszközök</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Távoli hibakeresés USB-n</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Keresési gyorsparancsok megjelenítése</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Keresőszolgáltatások megjelenítése</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Keresési javaslatok</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1469,4 +1467,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Rendben, értem</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Gyorsbillentyűk</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Keresés ezzel:</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Ezúttal keressen a következővel:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Keresési gyorsparancsok megjelenítése</string>
+    </resources>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 3f6f99682..65af986e7 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -149,13 +149,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Սկանավորել</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Դյուրանցումներ</string>
+    <string name="search_engines_shortcut_button">Որոնիչ</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">Որոնիչի կարգավորումներ</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Որոնել հետևյալում՝</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Այս անգամ որոնել հետևյալով՝</string>
+    <string name="search_engines_search_with">Այս անգամ որոնել հետևյալով՝</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Լրացնել հղումը սեղմատախտակից</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -263,8 +261,8 @@
     <string name="developer_tools_category">Մշակողի գործիքներ</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Հեռակա վրիպազերծում USB-ով</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Ցուցադրել որոնման դյուրացումները</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Ցուցադրել որոնիչները</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Ցուցադրել որոնման հուշումներ</string>
 
@@ -575,6 +573,8 @@
     <string name="bookmark_select_folder">Ընտրել պանակ</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս պանակը:</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s-ը կջնջի ընտրված միույթները:</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s-ը ջնջվել է</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -630,8 +630,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Ջնջվել է %1$s-ը</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Էջանիշը ջնջվեց</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Ընտրված պանակների ջնջում</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ՀԵՏԱՐԿԵԼ</string>
 
@@ -726,6 +728,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d ներդիր է ընտրված</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Ներդիրները պահպանված են:</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Հավաքածուն պահպանվել է</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Ներդիրը պահպանված է:</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -833,6 +837,10 @@
     <string name="qr_scanner_dialog_negative">ԱՐԳԵԼԵԼ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Համոզվա՞ծ եք, որ ցանկանում եք ջնջել %1$s-ը։</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Այս ներդիրի ջնջումը կհեռացնի ամբողջ հավաքածուն: Կարող եք ստեգղծել նոր հավաքածու ցանկացած ժամանակ:</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Ջնջե՞լ %1$s-ը:</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Ջնջել</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1231,6 +1239,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Մուտքանունները և գաղտնաբառերը, որոնք չեն պահպանվել, կցուցադրվեն այստեղ:</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Մուտքանունները և գաղտնաբառերը չեն պահպանվի այս կայքերի համար:</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Ջնջել բոլոր բացառությունները</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Որոնել մուտքանուններ</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1270,6 +1280,8 @@
     <string name="saved_login_copy_username">Պատճենել օգտվողի անունը</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Պատճենել կայքը</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Բացել կայքը դիտարկիչում</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Ցուցադրել գաղտնաբառը</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1445,4 +1457,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Հասկանալի է</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Դյուրանցումներ</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Որոնել հետևյալում՝</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Այս անգամ որոնել հետևյալով՝</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Ցուցադրել որոնման դյուրացումները</string>
+    </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5e5d2b00d..de28339d1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -151,14 +151,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Leggi</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Scelte rapide</string>
+    <string name="search_engines_shortcut_button">Motore di ricerca</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">Impostazioni motori di ricerca</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Cerca con</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Adesso cerca con:</string>
+    <string name="search_engines_search_with">Adesso cerca con:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Copia il link dagli appunti</string>
 
@@ -269,8 +266,8 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Debug remoto tramite USB</string>
 
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Mostra le scorciatoie di ricerca</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Visualizza i motori di ricerca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostra suggerimenti di ricerca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1493,4 +1490,14 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, tutto chiaro</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Scelte rapide</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Cerca con</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Adesso cerca con:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Mostra le scorciatoie di ricerca</string>
+    </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index dacb1a106..a5acf32f2 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -24,6 +24,22 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s לשוניות פתוחות. יש להקיש כדי להחליף לשוניות.</string>
 
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">הוספת אוסף חדש</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">שם</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">בחירת אוסף</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">יציאה ממצב בחירה מרובה</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">שמירת הלשוניות שנבחרו לאוסף</string>
+
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">בוצעה יציאה ממצב בחירה מרובה</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">בוצעה כניסה למצב בחירה מרובה, יש לבחור בלשוניות כדי לשמור לאוסף</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">‏%1$s נוצר על־ידי Mozilla.</string>
 
@@ -32,7 +48,7 @@
     <string name="private_browsing_title">הפעלה זו היא הפעלה פרטית</string>
     <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
         The first parameter is the name of the app defined in app_name (for example: Fenix) -->
-    <string name="private_browsing_placeholder_description_2">%1$s מנקה את היסטוריית החיפוש והגלישה שלך מלשוניות פרטיות בעת סגירתן או כשהיישומון נסגר. פעולה זו אמנם לא הופכת אותך לאלמוני כלפי אתרים או ספק האינטרנט שלך, אבל כן מקלה עליך בשמירה על הפעולות המקוונות שלך מפני כל מי שמשתמש במכשיר זה.</string>
+    <string name="private_browsing_placeholder_description_2">‏%1$s מנקה את היסטוריית החיפוש והגלישה שלך מלשוניות פרטיות בעת סגירתן או כשהיישומון נסגר. פעולה זו אמנם לא הופכת אותך לאלמוני כלפי אתרים או ספק האינטרנט שלך, אבל כן מקלה עליך בשמירה על הפעולות המקוונות שלך מפני כל מי שמשתמש במכשיר זה.</string>
     <string name="private_browsing_common_myths">
        מיתוסים נפוצים על גלישה פרטית
     </string>
@@ -143,13 +159,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">סריקה</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">קיצורי דרך</string>
+    <string name="search_engines_shortcut_button">מנוע חיפוש</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">הגדרות מנוע חיפוש</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">חיפוש באמצעות</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">הפעם, לחפש באמצעות:</string>
+    <string name="search_engines_search_with">הפעם, לחפש באמצעות:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">מילוי קישור מהלוח</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -254,8 +268,8 @@
     <string name="developer_tools_category">כלי פיתוח</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">ניפוי שגיאות מרחוק דרך USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">הצגת קיצורי דרך לחיפוש</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">הצגת מנועי חפוש</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">הצגת הצעות חיפוש</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -499,6 +513,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">‏%1$s (מצב פרטי)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">שמירה</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">מחיקת היסטוריה</string>
@@ -1421,4 +1438,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">בסדר, הבנתי</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">קיצורי דרך</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">חיפוש באמצעות</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">הפעם, לחפש באמצעות:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">הצגת קיצורי דרך לחיפוש</string>
+    </resources>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index d58acebf4..df45a9797 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -146,14 +146,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">წაკითხვა</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">მალსახმობები</string>
+    <string name="search_engines_shortcut_button">საძიებო სისტემა</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">საძიებო სისტემის პარამეტრები</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">ძიება</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">ძიებისთვის გამოიყენეთ:</string>
+    <string name="search_engines_search_with">ამჯერად, მოსაძიებლად გამოიყენეთ:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">ბმულის შევსება აღებული ასლით</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -263,8 +260,8 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">დაშორებული გამართვა USB-ით</string>
 
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">ძიების მალსახმობები</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">საძიებო სისტემების ჩვენება</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">ძიების შემოთავაზების ჩვენება</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -576,6 +573,8 @@
     <string name="bookmark_select_folder">საქაღალდის მითითება</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">ნამდვილად გსურთ ამ საქაღალდის წაშლა?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s წაშლის მონისნულებს.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">წაიშალა %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -632,8 +631,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">წაიშალა %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">სანიშნები წაიშალა</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">იშლება მითითებული საქაღალდეები</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">დაბრუნება</string>
 
@@ -726,6 +727,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d ჩანართია შერჩეული</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">ჩანართები შენახულია!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">კრებულის შენახულია!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">ჩანართი შენახულია!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -831,6 +834,10 @@
     <string name="qr_scanner_dialog_negative">უარყოფა</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">ნამდვილად გსურთ, წაიშალოს %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">ამ ჩანართის წაშლით, მთლიანი კრებული წაიშლება. ახალი კრებულების შექმნა, ნებისმიერ დროს შეგეძლებათ.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">წაიშალოს %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">წაშლა</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -886,8 +893,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">წაიშლება დათვალიერებული გვერდების მონაცემები მენიუში „გამოსვლაზე“ დაჭერისას</string>
     <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
     <string name="preference_summary_delete_browsing_data_on_quit_2">წაიშლება დათვალიერებული გვერდების მონაცემები მენიუში „გამოსვლაზე“ დაჭერისას</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">დათვალიერების ისტორია</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">გამოსვლა</string>
 
@@ -1234,6 +1239,8 @@
 
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">ანგარიშის მონაცემები არ შეინახება ამ საიტებისთვის.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">ყველა გამონაკლისის წაშლა</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">ანგარიშების ძიება</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1273,6 +1280,8 @@
     <string name="saved_login_copy_username">მომხმარებლის ასლი</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">საიტის ასლი</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">საიტის ბრაუზერში გახსნა</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">პაროლის გამოჩენა</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1448,4 +1457,14 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">კარგი, გასაგებია</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">მალსახმობები</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">ძიება</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">ძიებისთვის გამოიყენეთ:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">ძიების მალსახმობები</string>
+    </resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index d49539e2b..e06544d66 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -148,13 +148,11 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Snirem</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Inegzumen</string>
+    <string name="search_engines_shortcut_button">Amsedday n unadi</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">Iɣewwaṛen n umsedday n unadi</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Nadi s</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Tikkelt-agi, nadi s:</string>
+    <string name="search_engines_search_with">Tikkelt-agi, nadi s:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Ččaṛ sef tkatut ɣef afus</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -262,8 +260,8 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <string name="developer_tools_category">Ifecka n tneflit</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Taseɣtayt tanmeggagt s USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Sken anadi n yinegzumen</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Sken-d imseddayen n unadi</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Sken isumar n unadi</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1468,4 +1466,13 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">IH, awi-t-id</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Inegzumen</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Nadi s</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Tikkelt-agi, nadi s:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Sken anadi n yinegzumen</string>
+    </resources>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 6cc73e343..9270eb873 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -145,13 +145,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Сканерлеу</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Жарлықтар</string>
+    <string name="search_engines_shortcut_button">Іздеу жүйесі</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">Іздеу жүйесінің параметрлері</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Көмегімен іздеу</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Осы рет, келесімен іздеу:</string>
+    <string name="search_engines_search_with">Осы рет, келесімен іздеу:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Алмасу буферінен сілтемені кірістіру</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -258,8 +256,8 @@
     <string name="developer_tools_category">Әзірлеуші құралдары</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB арқылы қашықтан жөндеу</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Іздеу жарлықтарын көрсету</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Іздеу жүйелерін көрсету</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Іздеу ұсыныстарын көрсету</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1450,4 +1448,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Жақсы, түсіндім</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Жарлықтар</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Көмегімен іздеу</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Осы рет, келесімен іздеу:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Іздеу жарлықтарын көрсету</string>
+    </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e5804fd6a..6997a10e0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -27,6 +27,32 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">열린 탭 %1$s개. 탭을 전환하려면 누르세요.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d개 선택됨</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">새 컬렉션 추가</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">이름</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">컬렉션 선택</string>
+
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">다중 선택 모드 종료</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">선택한 탭을 컬렉션에 저장</string>
+
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s 선택됨</string>
+
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s 선택 취소됨</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">다중 선택 모드 종료됨</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">다중 선택 모드로 전환됨, 컬렉션에 저장할 탭을 선택하세요</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">선택됨</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s는 Mozilla에서 제작했습니다.</string>
 
@@ -111,7 +137,7 @@
     <!-- Browser menu button that creates a new tab -->
     <string name="browser_menu_new_tab">새 탭</string>
     <!-- Browser menu button that saves the current tab to a collection -->
-    <string name="browser_menu_save_to_collection_2">모음집에 저장</string>
+    <string name="browser_menu_save_to_collection_2">컬렉션에 저장</string>
     <!-- Browser menu button that open a share menu to share the current site -->
     <string name="browser_menu_share">공유</string>
     <!-- Share menu title, displayed when a user is sharing their current site -->
@@ -155,14 +181,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">스캔</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">바로 가기</string>
+    <string name="search_engines_shortcut_button">검색 엔진</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">검색 엔진 설정</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">검색</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">이번에 사용할 검색 엔진:</string>
+    <string name="search_engines_search_with">이번에 사용할 검색 엔진:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">클립보드로부터 링크 채우기</string>
 
@@ -271,8 +294,8 @@
     <string name="developer_tools_category">개발자 도구</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB 원격 디버깅</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">검색 바로 가기 표시</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">검색 엔진 표시</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">검색 제안 표시</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -472,7 +495,7 @@
     <!-- Text shown as the title of the open tab tray -->
     <string name="tab_tray_title">탭 열기</string>
     <!-- Text shown in the menu for saving tabs to a collection -->
-    <string name="tab_tray_menu_item_save">모음집에 저장</string>
+    <string name="tab_tray_menu_item_save">컬렉션에 저장</string>
     <!-- Text shown in the menu for sharing all tabs -->
     <string name="tab_tray_menu_item_share">모든 탭 공유</string>
     <!-- Text shown in the menu for closing all tabs -->
@@ -484,7 +507,7 @@
     <!-- Shortcut action to toggle private mode -->
     <string name="tab_tray_menu_toggle">탭 모드 전환</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">모음집에서 탭 삭제</string>
+    <string name="remove_tab_from_collection">컬렉션에서 탭 삭제</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
     <string name="close_tab">탭 닫기</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab <title> button. First parameter is tab title  -->
@@ -496,7 +519,7 @@
     <!-- Open tabs menu item to share all tabs -->
     <string name="tabs_menu_share_tabs">탭 공유</string>
     <!-- Open tabs menu item to save tabs to collection -->
-    <string name="tabs_menu_save_to_collection1">모음집에 탭 저장</string>
+    <string name="tabs_menu_save_to_collection1">탭을 컬렉션에 저장</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->
     <string name="tab_menu">탭 메뉴</string>
     <!-- Tab menu item to share the tab -->
@@ -511,11 +534,11 @@
     <string name="current_session_image">현재 세션 이미지</string>
 
     <!-- Button to save the current set of tabs into a collection -->
-    <string name="save_to_collection">모음집에 저장</string>
+    <string name="save_to_collection">컬렉션에 저장</string>
     <!-- Text for the menu button to delete a collection -->
-    <string name="collection_delete">모음집 삭제</string>
+    <string name="collection_delete">컬렉션 삭제</string>
     <!-- Text for the menu button to rename a collection -->
-    <string name="collection_rename">모음집 이름 변경</string>
+    <string name="collection_rename">컬렉션 이름 변경</string>
     <!-- Text for the button to open tabs of the selected collection -->
     <string name="collection_open_tabs">열린 탭</string>
 
@@ -526,6 +549,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (사생활 보호 모드)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">저장</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">기록 삭제</string>
@@ -723,9 +749,9 @@
 
     <!-- Collections -->
     <!-- Collections header on home fragment -->
-    <string name="collections_header">모음집</string>
+    <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>
+    <string name="collection_menu_button_content_description">컬렉션 메뉴</string>
 
     <!-- No Open Tabs Message Header -->
     <string name="no_collections_header1">중요한 것들을 모으세요</string>
@@ -735,13 +761,13 @@
     <string name="create_collection_select_tabs">탭 선택</string>
 
     <!-- Title for the "select collection" step of the collection creator -->
-    <string name="create_collection_select_collection">모음집 선택</string>
+    <string name="create_collection_select_collection">컬렉션 선택</string>
 
     <!-- Title for the "name collection" step of the collection creator -->
-    <string name="create_collection_name_collection">모음집 이름</string>
+    <string name="create_collection_name_collection">컬렉션 이름</string>
 
     <!-- Button to add new collection for the "select collection" step of the collection creator -->
-    <string name="create_collection_add_new_collection">새 모음집 추가</string>
+    <string name="create_collection_add_new_collection">새 컬렉션 추가</string>
 
     <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
     <string name="create_collection_select_all">모두 선택</string>
@@ -762,7 +788,7 @@
     <string name="create_collection_tabs_saved">탭이 저장되었습니다!</string>
 
     <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
-    <string name="create_collection_tabs_saved_new_collection">모음집 저장됨!</string>
+    <string name="create_collection_tabs_saved_new_collection">컬렉션 저장됨!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">탭이 저장되었습니다!</string>
 
@@ -776,7 +802,7 @@
     <string name="create_collection_view">보기</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">모음집 %d개</string>
+    <string name="create_collection_default_name">컬렉션 %d개</string>
 
     <!-- Share -->
     <!-- Share screen header -->
@@ -836,10 +862,10 @@
     <!-- Name of the "Powered by Fenix" notification channel. Displayed in the "App notifications" system settings for the app -->
     <string name="notification_powered_by_channel_name">제공:</string>
     <!-- Text shown in snackbar when user deletes a collection -->
-    <string name="snackbar_collection_deleted">모음집 삭제됨</string>
+    <string name="snackbar_collection_deleted">컬렉션 삭제됨</string>
 
     <!-- Text shown in snackbar when user renames a collection -->
-    <string name="snackbar_collection_renamed">모음집 이름 변경됨</string>
+    <string name="snackbar_collection_renamed">컬렉션 이름 변경됨</string>
     <!-- Text shown in snackbar when user deletes a tab -->
     <string name="snackbar_tab_deleted">탭 삭제됨</string>
 
@@ -876,9 +902,9 @@
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">%1$s 파일을 삭제하시겠습니까?</string>
     <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
-    <string name="delete_tab_and_collection_dialog_message">이 탭을 삭제하면 전체 모음집이 삭제됩니다. 언제든지 새 모음집을 만들 수 있습니다.</string>
+    <string name="delete_tab_and_collection_dialog_message">이 탭을 삭제하면 전체 컬렉션이 삭제됩니다. 언제든지 새 컬렉션을 만들 수 있습니다.</string>
     <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
-    <string name="delete_tab_and_collection_dialog_title">%1$s 모음집을 삭제하시겠습니까?</string>
+    <string name="delete_tab_and_collection_dialog_title">%1$s 컬렉션을 삭제하시겠습니까?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">삭제</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1505,4 +1531,14 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">확인</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">바로 가기</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">검색</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">이번에 사용할 검색 엔진:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">검색 바로 가기 표시</string>
+    </resources>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index 579f17bd9..f1f9830c4 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -142,14 +142,8 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">ສະແກນ</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">ທາງລັດ</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">ການຕັ້ງຄ່າຂອງເຄື່ອງມືຄົ້ນຫາ</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">ຄົ້ນຫາດ້ວຍ</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">ຄັ້ງນີ້ ຄົ້ນຫາດ້ວຍ:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">ເຕີມລີ້ງຈາກຄິບບອດ</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -258,8 +252,6 @@
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">ການດີບັກທາງໄກຜ່ານທາງ USB</string>
 
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">ສະແດງທາງລັດການຄົ້ນຫາ</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">ສະແດງຜົນການແນະນຳການຄົ້ນຫາ</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -634,7 +626,7 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">ລຶບ %1$s ແລ້ວ</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">ລຶບບຸກມາກແລ້ວ</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ເອົາກັບຄືນ</string>
@@ -834,6 +826,8 @@
     <string name="qr_scanner_dialog_negative">ປະຕິເສດ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">ທ່ານແນ່ໃຈແລ້ວບໍ່ວ່າທ່ານຕ້ອງການລຶບ %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">ລຶບ %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">ລຶບ</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1111,4 +1105,43 @@
     <!-- Category of trackers (cross-site tracking cookies) that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cookies_title">ຕົວຕິດຕາມຄຸກກີ້ Cross-Site</string>
 
+    <!-- Browser long press popup menu -->
+    <!-- Copy the current url -->
+    <string name="browser_toolbar_long_press_popup_copy">ສຳເນົາ</string>
+    <!-- Paste & go the text in the clipboard. '&amp;' is replaced with the ampersand symbol: & -->
+    <string name="browser_toolbar_long_press_popup_paste_and_go">ວາງ &amp; ໄປ</string>
+    <!-- Paste the text in the clipboard -->
+    <string name="browser_toolbar_long_press_popup_paste">ວາງ</string>
+
+    <!-- Cancel button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_cancel">ຍົກເລີກ</string>
+    <!-- Add button text for the Add to Homescreen dialog -->
+    <string name="add_to_homescreen_add">ເພີ່ມ</string>
+
+    <!-- Preference option for asking to save passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_ask_to_save">ຖາມເພື່ອບັນທຶກ</string>
+    <!-- Preference option for never saving passwords in Fenix -->
+    <string name="preferences_passwords_save_logins_never_save">ບໍ່ຕ້ອງບັນທຶກ</string>
+    <!-- Preference for autofilling saved logins in Fenix -->
+    <string name="preferences_passwords_autofill">ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ</string>
+    <!-- Syncing saved logins in Fenix is on -->
+    <string name="preferences_passwords_sync_logins_on">ເປີດ</string>
+    <!-- Syncing saved logins in Fenix is off -->
+    <string name="preferences_passwords_sync_logins_off">ປິດ</string>
+    <!-- Syncing saved logins in Fenix needs reconnect to sync -->
+    <string name="preferences_passwords_sync_logins_reconnect">ເຊື່ອມຕໍ່ຄືນໃຫມ່</string>
+    <!-- Syncing saved logins in Fenix needs login -->
+    <string name="preferences_passwords_sync_logins_sign_in">ເຂົ້າສູ່ລະບົບເພື່ອ Sync</string>
+    <!-- Preference to access list of saved logins -->
+    <string name="preferences_passwords_saved_logins">ບັກທຶກການລັອກອິນໄວ້</string>
+
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">ທາງລັດ</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">ຄົ້ນຫາດ້ວຍ</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">ຄັ້ງນີ້ ຄົ້ນຫາດ້ວຍ:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">ສະແດງທາງລັດການຄົ້ນຫາ</string>
     </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 51452ce7b..e88ab49ec 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -148,14 +148,9 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Nuskaityti</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Leistukai</string>
+    <string name="search_engines_shortcut_button">Ieškyklė</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">Ieškyklės nuostatos</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Ieškoti per</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Šįkart ieškoti su:</string>
-
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Atverti saitą iš iškarpinės</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -263,9 +258,8 @@
     <string name="developer_tools_category">Programuotojo priemonės</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Nuotolinis derinimas per USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Rodyti paieškos leistukus</string>
-
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Rodyti ieškykles</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Rodyti paieškos siūlymus</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1471,4 +1465,15 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Gerai, supratau</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Leistukai</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Ieškoti per</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Šįkart ieškoti su:</string>
+
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Rodyti paieškos leistukus</string>
+
+    </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 01954b6c4..bab02a0e1 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -24,6 +24,22 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s åpne faner. Trykk for å bytte fane.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d valgt</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Legg til ny samling</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Navn</string>
+
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Velg samling</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Lagre valgte faner i samlingen</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">Valgte %1$s</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Valgt</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s er produsert av Mozilla.</string>
 
@@ -514,6 +530,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (privatmodus)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Lagre</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Slett historikk</string>
@@ -1126,7 +1145,7 @@
     <!-- Option for enhanced tracking protection for the custom protection settings for tracking content-->
     <string name="preference_enhanced_tracking_protection_custom_tracking_content_3">Bare i tilpassede faner</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
-    <string name="preference_enhanced_tracking_protection_custom_cryptominers">Kryptominere</string>
+    <string name="preference_enhanced_tracking_protection_custom_cryptominers">Kryptoutvinnere</string>
     <!-- Preference for enhanced tracking protection for the custom protection settings -->
     <string name="preference_enhanced_tracking_protection_custom_fingerprinters">Fingerprinters</string>
     <string name="enhanced_tracking_protection_blocked">Blokkert</string>
@@ -1142,7 +1161,7 @@
     <!-- Description of cross-site tracking cookies that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cookies_description">Blokkerer informasjonskapsler som annonsenettverk og analyseselskap bruker for å sammenstille aktivitet en din på nettet på tvers av nettsteder.</string>
     <!-- Category of trackers (cryptominers) that can be blocked by Enhanced Tracking Protection -->
-    <string name="etp_cryptominers_title">Kryptominere</string>
+    <string name="etp_cryptominers_title">Kryptoutvinnere</string>
     <!-- Description of cryptominers that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_cryptominers_description">Forhindrer ondsinnede skript som får tilgang til enheten din for å utvinne digitale valutaer.</string>
     <!-- Category of trackers (fingerprinters) that can be blocked by Enhanced Tracking Protection -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index da3638ceb..adcc99381 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -154,13 +154,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scannen</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Snelkoppelingen</string>
+    <string name="search_engines_shortcut_button">Zoekmachine</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">Instellingen zoekmachine</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Zoeken met</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Deze keer zoeken met:</string>
+    <string name="search_engines_search_with">Deze keer zoeken met:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Koppeling vanaf klembord invullen</string>
 
@@ -268,8 +266,8 @@
     <string name="developer_tools_category">Ontwikkelaarshulpmiddelen</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Zoeksnelkoppelingen tonen</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Zoekmachines tonen</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Zoeksuggesties tonen</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1467,4 +1465,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, begrepen</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Snelkoppelingen</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Zoeken met</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Deze keer zoeken met:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Zoeksnelkoppelingen tonen</string>
+    </resources>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 70b0566dd..c135de51a 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -148,8 +148,12 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skann</string>
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_engines_shortcut_button">Søkjemotor</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">Innstillingar for søkjemotor</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_engines_search_with">Denne gongen, søk med:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Fyll inn lenke frå utklippstavla</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -259,6 +263,8 @@
 
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Fjernfeilsøking via USB</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Vis søkjemotorar</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Vis søkjeforslag</string>
     <!-- Preference title for switch preference to show voice search button -->
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 3d7507109..e67e6691b 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -130,6 +130,10 @@
     <!-- Browser menu button to configure reader mode appearance e.g. the used font type and size -->
     <string name="browser_menu_read_appearance">Aparéncia</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">Connexion impossibla. Esquèma d’URL desconegut.</string>
+
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Lenga seleccionada</string>
@@ -144,13 +148,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Escanerizar</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Acorchis</string>
+    <string name="search_engines_shortcut_button">Motor de recèrca</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">Paramètres del motor de recèrca</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Recercar amb</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Aqueste còp, recercar amb :</string>
+    <string name="search_engines_search_with">Aqueste còp, recercar amb :</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Utilizar lo ligam del quichapapièr</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -257,8 +259,8 @@
     <string name="developer_tools_category">Aisinas pels desvolopaires</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Desbugatge distant per USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Mostrar los acorchis de recèrca</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Mostrar motors de recèrca</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar las suggestions de recèrca</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -715,6 +717,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d onglet seleccionat</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Onglets enregistrats !</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Colleccion enregistrada</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Onglet enregistrat !</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -763,6 +767,8 @@
     <!-- Text for the warning message on the Add new device screen -->
     <string name="sync_add_new_device_message">Cap de periferic pas connectat</string>
 
+    <!-- Text for the button to learn about sending tabs -->
+    <string name="sync_add_new_device_learn_button">Ne saber mai sul mandadís d’onglets…</string>
     <!-- Text for the button to connect another device -->
     <string name="sync_add_new_device_connect_button">Connectar un autre periferic…</string>
 
@@ -828,6 +834,8 @@
     <!-- Message for copying the URL via long press on the toolbar -->
     <string name="url_copied">URL copiada</string>
 
+    <!-- Summary for Accessibility Text Size Scaling Preference -->
+    <string name="preference_accessibility_text_size_summary">Va venir lo tèxt dels sites mai grand o mai pichon</string>
     <!-- Title for Accessibility Text Size Scaling Preference -->
     <string name="preference_accessibility_font_size_title">Talha de poliça</string>
 
@@ -856,12 +864,16 @@
     <string name="preferences_delete_browsing_data_cookies_subtitle">La session de la màger part dels sites se tamparà</string>
     <!-- Title for the cached images and files item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_cached_files">Imatges e fichièrs en cache</string>
+    <!-- Subtitle for the cached images and files item in Delete browsing data -->
+    <string name="preferences_delete_browsing_data_cached_files_subtitle">Libèra d’espaci d’emmagazinatge</string>
     <!-- Title for the site permissions item in Delete browsing data -->
     <string name="preferences_delete_browsing_data_site_permissions">Permissions dels sites</string>
     <!-- Text for the button to delete browsing data -->
     <string name="preferences_delete_browsing_data_button">Suprimir las donadas de navegacion</string>
     <!-- Title for the Delete browsing data on quit preference -->
     <string name="preferences_delete_browsing_data_on_quit">Suprimir las donadas de navegacion en quitant</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">Suprimís automaticament las donadas de navegacion quand seleccionatz « Quitar » al menú principal</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Sortir</string>
 
@@ -1177,10 +1189,14 @@
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
     <string name="saved_login_hide_password">Amagar lo senhal</string>
 
+    <!-- Title of warning dialog if users have no device authentication set up -->
+    <string name="logins_warning_dialog_title">Protegissètz vòstres identificants e senhals</string>
     <!-- Negative button to ignore warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_later">Mai tard</string>
     <!-- Positive button to send users to set up a pin of warning dialog if users have no device authentication set up -->
     <string name="logins_warning_dialog_set_up_now">O configurar ara</string>
+    <!-- Title of PIN verification dialog to direct users to re-enter their device credentials to access their logins -->
+    <string name="logins_biometric_prompt_message_pin">Desverrolhatz lo periferic</string>
     <!-- Saved logins sorting strategy menu item -by name- (if selected, it will sort saved logins alphabetically) -->
     <string name="saved_logins_sort_strategy_alphabetically">Nom (A-Z)</string>
     <!-- Saved logins sorting strategy menu item -by last used- (if selected, it will sort saved logins by last used) -->
@@ -1310,4 +1326,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Òc, plan comprés</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Acorchis</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Recercar amb</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Aqueste còp, recercar amb :</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Mostrar los acorchis de recèrca</string>
+    </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a85a6e3c3..7dbafae79 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -149,13 +149,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Digitalizar</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Atalhos</string>
+    <string name="search_engines_shortcut_button">Mecanismo de pesquisa</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">Configurações de mecanismos de pesquisa</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Pesquisar com</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Desta vez, pesquisar com:</string>
+    <string name="search_engines_search_with">Desta vez, pesquisar com:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Usar link da área de transferência</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -262,8 +260,8 @@
     <string name="developer_tools_category">Ferramentas do desenvolvedor</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuração remota via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Mostrar atalhos de pesquisa</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Mostrar mecanismos de pesquisa</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugestões de pesquisa</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1461,4 +1459,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, entendi</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Atalhos</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Pesquisar com</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Desta vez, pesquisar com:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Mostrar atalhos de pesquisa</string>
+    </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1a640b8cf..cd3a32725 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -25,6 +25,19 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s separadores abertos. Toque para mudar de separador.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d selecionados</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Adicionar nova coleção</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">Selecionar coleção</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Sair do modo de seleção múltipla</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Guardar selecionados separadores na coleção</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s é criado pela Mozilla.</string>
 
@@ -149,13 +162,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Digitalizar</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Atalhos</string>
+    <string name="search_engines_shortcut_button">Motor de pesquisa</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">Definições do motor de pesquisa</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Pesquisar com</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Desta vez, pesquisar com:</string>
+    <string name="search_engines_search_with">Desta vez, pesquisar com:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Preencher ligação da área de transferência</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -263,8 +274,8 @@
 
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depuração remota via USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Mostrar atalhos de pesquisa</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Mostrar motores de pesquisa</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Mostrar sugestões de pesquisa</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1464,4 +1475,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, percebi</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Atalhos</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Pesquisar com</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Desta vez, pesquisar com:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Mostrar atalhos de pesquisa</string>
+    </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 3b3a5ae84..45557d742 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -23,6 +23,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s file deschise. Atinge pentru a comuta filele.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d selectate</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Adaugă o colecție nouă</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Denumire</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Selectează colecția</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Ieși din modul de selecție multiplă</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Salvează în colecție filele selectate</string>
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">%1$s selectate</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">%1$s neselectate</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Ai ieșit din modul de selectare multiplă</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">După ce intri în modul de selectare multiplă, selectează filele de salvat într-o colecție</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Selectate</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s este realizat de Mozilla.</string>
 
@@ -145,13 +168,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Scanează</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Comenzi rapide</string>
+    <string name="search_engines_shortcut_button">Motor de căutare</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">Setări pentru motorul de căutare</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Căutare cu</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">De data aceasta, caută cu:</string>
+    <string name="search_engines_search_with">De data aceasta, caută cu:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Completează linkul din clipboard</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -254,13 +275,13 @@
     <!-- Preference for data collection -->
     <string name="preferences_data_collection">Colectare de date</string>
     <!-- Preference linking to the privacy notice -->
-    <string name="preferences_privacy_link">Politica de confidențialitate</string>
+    <string name="preferences_privacy_link">Notificare privind confidențialitatea</string>
     <!-- Preference category for developer tools -->
     <string name="developer_tools_category">Unelte pentru dezvoltatori</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Depanare de la distanță prin USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Afișează comenzile rapide pentru căutări</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Afișează motoare de căutare</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Afișează sugestii de căutare</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -294,7 +315,7 @@
     <!-- Preference for syncing tabs -->
     <string name="preferences_sync_tabs_2">File deschise</string>
     <!-- Preference for signing out -->
-    <string name="preferences_sign_out">Deconectare</string>
+    <string name="preferences_sign_out">Deconectează-te</string>
     <!-- Preference displays and allows changing current FxA device name -->
     <string name="preferences_sync_device_name">Numele dispozitivului</string>
     <!-- Text shown when user enters empty device name -->
@@ -505,6 +526,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (mod privat)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Salvează</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Șterge istoricul</string>
@@ -570,6 +594,8 @@
     <string name="bookmark_select_folder">Selectează dosarul</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Sigur vrei să ștergi acest dosar?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s va șterge elementele selectate.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s șters</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -624,8 +650,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s șters</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Marcaje șterse</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Se șterg dosarele selectate</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ANULEAZĂ</string>
 
@@ -639,7 +667,7 @@
         Secure settings status and a button to modify site permissions -->
     <string name="quick_settings_sheet">Fișă de setări rapide</string>
     <!-- Label that indicates that this option it the recommended one -->
-    <string name="phone_feature_recommended">Recomandată</string>
+    <string name="phone_feature_recommended">Opțiune recomandată</string>
 
     <!-- button that allows editing site permissions settings -->
     <string name="quick_settings_sheet_manage_site_permissions">Gestionează permisiunile pentru site-uri</string>
@@ -662,11 +690,11 @@
     <!-- Label that indicates that a permission must be asked always -->
     <string name="preference_option_phone_feature_ask_to_allow">Solicită pentru a permite</string>
     <!-- Label that indicates that a permission must be blocked -->
-    <string name="preference_option_phone_feature_blocked">Blocat</string>
+    <string name="preference_option_phone_feature_blocked">Blocat(ă)</string>
     <!-- Label that indicates that a permission must be allowed -->
     <string name="preference_option_phone_feature_allowed">Permis</string>
     <!--Label that indicates a permission is by the Android OS-->
-    <string name="phone_feature_blocked_by_android">Blocat de Android</string>
+    <string name="phone_feature_blocked_by_android">Blocat(ă) de Android</string>
     <!-- Preference for showing a list of websites that the default configurations won't apply to them -->
     <string name="preference_exceptions">Excepții</string>
     <!-- Summary of tracking protection preference if tracking protection is set to on -->
@@ -720,6 +748,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d filă selectată</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">File salvate!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Colecție salvată!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Filă salvată!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -825,6 +855,10 @@
     <string name="qr_scanner_dialog_negative">REFUZĂ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Sigur vrei să ștergi %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Ștergerea acestei file va șterge toată colecția. Poți crea în orice moment colecții noi.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Ștergi %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Șterge</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -841,7 +875,7 @@
     <string name="preference_accessibility_font_size_title">Dimensiunea fontului</string>
 
     <!-- Title for Accessibility Text Automatic Size Scaling Preference -->
-    <string name="preference_accessibility_auto_size_2">Mărime automată a fontului</string>
+    <string name="preference_accessibility_auto_size_2">Dimensionare automată pentru fonturi</string>
     <!-- Summary for Accessibility Text Automatic Size Scaling Preference -->
     <string name="preference_accessibility_auto_size_summary">Dimensiunea fontului va coincide cu cea din setările Android. Dezactivează pentru a gestiona aici dimensiunea fontului.</string>
 
@@ -900,8 +934,8 @@
     <!-- text for firefox preview moving tip header "Firefox Preview" and "Firefox Nightly" are intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_header">Firefox Preview este acum Firefox Nightly</string>
     <!-- text for firefox preview moving tip description -->
-    <string name="tip_firefox_preview_moved_description">Firefox Nightly se actualizează în fiecare seară și are funcționalități experimentale noi
-        Dar poate fi mai puțin stabil. Descarcă browserul nostru beta pentru o experiență mai stabilă.</string>
+    <string name="tip_firefox_preview_moved_description">Firefox Nightly se actualizează în fiecare seară și are funcționalități experimentale noi.
+        Însă poate fi mai puțin stabil. Descarcă browserul nostru beta pentru o experiență mai stabilă.</string>
 
     <!-- text for firefox preview moving tip button. "Firefox for Android Beta" is intentionally hardcoded -->
     <string name="tip_firefox_preview_moved_button_2">Descarcă Firefox Beta pentru Android</string>
@@ -995,7 +1029,7 @@
     <string name="onboarding_privacy_notice_description">Am proiectat %s să îți dea control asupra a ceea ce partajezi
         online și ce partajezi cu noi.</string>
     <!-- Text for the button to read the privacy notice -->
-    <string name="onboarding_privacy_notice_read_button">Citește politica noastră de confidențialitate</string>
+    <string name="onboarding_privacy_notice_read_button">Citește notificarea noastră privind confidențialitatea</string>
 
     <!-- Content description (not visible, for screen readers etc.): Close onboarding screen -->
     <string name="onboarding_close">Închide</string>
@@ -1040,9 +1074,9 @@
     <!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. Firefox Preview) -->
     <string name="sign_out_confirmation_message_2">%s va înceta să se mai sincronizeze cu contul tău, dar nu va șterge nimic din datele de navigare de pe acest dispozitiv.</string>
     <!-- Option to continue signing out of account shown in confirmation dialog to sign out of account -->
-    <string name="sign_out_disconnect">Deconectare</string>
+    <string name="sign_out_disconnect">Deconectează-te</string>
     <!-- Option to cancel signing out shown in confirmation dialog to sign out of account -->
-    <string name="sign_out_cancel">Anulare</string>
+    <string name="sign_out_cancel">Anulează</string>
     <!-- Error message snackbar shown after the user tried to select a default folder which cannot be altered -->
     <string name="bookmark_cannot_edit_root">Dosarele implicite nu pot fi editate</string>
 
@@ -1149,7 +1183,7 @@
     <!-- About page link text to list of past crashes (like about:crashes on desktop) -->
     <string name="about_crashes">Defecțiuni</string>
     <!-- About page link text to open privacy notice link -->
-    <string name="about_privacy_notice">Politică de confidențialitate</string>
+    <string name="about_privacy_notice">Notificare privind confidențialitatea</string>
     <!-- About page link text to open know your rights link -->
     <string name="about_know_your_rights">Cunoaște-ți drepturile</string>
     <!-- About page link text to open licensing information link -->
@@ -1223,6 +1257,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Aici vor apărea datele de autentificare și parolele nesalvate.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Datele de autentificare și parolele nu vor fi salvate pentru aceste site-uri.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Șterge toate excepțiile</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Caută date de autentificare</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1261,6 +1297,8 @@
     <string name="saved_login_copy_username">Copiază numele de utilizator</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Copiază site-ul</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Deschide site-ul în browser</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Afișeză parola</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1436,4 +1474,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Ok, am înțeles</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Comenzi rapide</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Căutare cu</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">De data aceasta, caută cu:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Afișează comenzile rapide pentru căutări</string>
+    </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9844559eb..0e2d38b00 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -154,13 +154,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Cканировать</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Ярлыки</string>
+    <string name="search_engines_shortcut_button">Поисковая система</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">Настройки поисковых систем</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Искать в</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">В этот раз искать с помощью:</string>
+    <string name="search_engines_search_with">В этот раз искать с помощью:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Вставить ссылку из буфера обмена</string>
 
@@ -269,8 +267,8 @@
     <string name="developer_tools_category">Инструменты разработчика</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Удалённая отладка по USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Ссылки на поисковые системы</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Показать поисковые системы</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Поисковые предложения</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -588,6 +586,8 @@
     <string name="bookmark_select_folder">Выбрать папку</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Вы действительно хотите удалить эту папку?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s удалит выбранные элементы.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s удалён</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -643,8 +643,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s удалён</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Закладки удалены</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Удаление выбранных папок</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ОТМЕНИТЬ</string>
 
@@ -748,6 +750,8 @@
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Вкладки сохранены!</string>
 
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Коллекция сохранена!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Вкладка сохранена!</string>
 
@@ -859,6 +863,10 @@
     <string name="qr_scanner_dialog_negative">ЗАПРЕТИТЬ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Вы уверены, что хотите удалить %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Удалив эту вкладку, вы удалите всю коллекцию. Вы можете создавать новые коллекции в любое время.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Удалить %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Удалить</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1261,6 +1269,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Здесь будут показаны не сохраняемые логины и пароли.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Логины и пароли для этих сайтов сохраняться не будут.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Удалить все исключения</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Поиск логинов</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1299,6 +1309,8 @@
     <string name="saved_login_copy_username">Копировать имя пользователя</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Копировать сайт</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Открыть сайт в браузере</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Показать пароль</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1472,4 +1484,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, понятно</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Ярлыки</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Искать в</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">В этот раз искать с помощью:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Ссылки на поисковые системы</string>
+    </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 00d2d95a6..1dd733fe0 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -151,14 +151,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skenovať</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Skratky</string>
+    <string name="search_engines_shortcut_button">Vyhľadávací modul</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">Nastavenia vyhľadávacieho modulu</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Hľadať pomocou</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Vyhľadať pomocou:</string>
+    <string name="search_engines_search_with">Vyhľadať pomocou:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Prilepiť odkaz zo schránky</string>
 
@@ -268,8 +265,8 @@
     <string name="developer_tools_category">Vývojárske nástroje</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Vzdialené ladenie cez USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Zobrazovať skratky vyhľadávania</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Zobraziť vyhľadávacie moduly</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Zobrazovať návrhy vyhľadávania</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -586,6 +583,8 @@
     <string name="bookmark_select_folder">Výber priečinku</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Naozaj chcete odstrániť tento priečinok?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s odstráni vybrané položky.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Bol odstránený priečinok %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -640,8 +639,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Bola odstránená záložka %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Záložky boli odstránené</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Odstraňovanie vybraných priečinkov</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">SPÄŤ</string>
 
@@ -736,6 +737,8 @@
     <string name="create_collection_save_to_collection_tab_selected">Bola vybraná %d karta</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Karty boli uložené!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Kolekcia bola uložená!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Karta bola uložená!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -842,6 +845,10 @@
     <string name="qr_scanner_dialog_negative">ZAMIETNUŤ</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Naozaj chcete odstrániť kolekciu %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Odstránením tejto karty sa odstráni celá kolekcia. Nové kolekcie môžete vytvoriť kedykoľvek.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Odstrániť %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Odstrániť</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1241,6 +1248,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Tu sa zobrazia prihlasovacie údaje, ktoré sa nebudú ukladať.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Pre nasledujúce stránky sa nebudú ukladať prihlasovacie údaje.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Odstrániť všetky výnimky</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Hľadať</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1279,6 +1288,8 @@
     <string name="saved_login_copy_username">Kopírovať používateľské meno</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Kopírovať stránku</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Otvoriť stránku v prehliadači</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Zobraziť heslo</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1453,4 +1464,14 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Ok, rozumiem</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Skratky</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Hľadať pomocou</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Vyhľadať pomocou:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Zobrazovať skratky vyhľadávania</string>
+    </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index e02406d15..c375ba925 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -147,13 +147,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Skanoje</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Shkurtore</string>
+    <string name="search_engines_shortcut_button">Motor Kërkimesh</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">Rregullime motorësh kërkimesh</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Kërkoni me</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Këtë herë kërko me:</string>
+    <string name="search_engines_search_with">Këtë herë kërko me:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Plotësoje lidhjen nga e papastra</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +259,8 @@
     <string name="developer_tools_category">Mjete zhvilluesi</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Diagnostikim së largëti përmes USB-je</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Shfaqni shkurtore kërkimi</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Shfaq motorë kërkimi</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Shfaq sugjerime kërkimi</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -575,6 +573,8 @@
     <string name="bookmark_select_folder">Përzgjidhni dosje</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Jeni i sigurt se doni të fshihet kjo dosje?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s do të fshijë objektet e përzgjedhur.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s u fshi</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -629,8 +629,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">U fshi %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Faqerojtësit u fshinë</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Po fshihen dosjet e përzgjedhura</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">ZHBËJE</string>
 
@@ -724,6 +726,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d skedë e përzgjedhur</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Skedat u ruajtën!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Koleksioni u ruajt!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Skeda u ruajt!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -828,6 +832,10 @@
     <string name="qr_scanner_dialog_negative">MOHOJE</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Jeni i sigurt se doni të fshihet %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Fshirja e kësaj skede do të fshijë krejt koleksionin. Mund të krijoni koleksione të rinj në çfarëdo kohe.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Të fshihet %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Fshije</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -884,8 +892,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Fshin automatikisht të dhënat e shfletimit, kur përzgjidhni “Dil” nga menuja kryesore</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">Fshin automatikisht të dhënat e shfletimit, kur përzgjidhni \“Dil\” nga menuja kryesore</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">Historik shfletimi</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Dil</string>
 
@@ -1233,6 +1239,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Këtu do të shfaqen kredenciale hyrjesh dhe fjalëkalime që nuk janë ruajtur.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Për këto sajte s’do të ruhen kredenciale hyrjesh dhe fjalëkalime.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Fshi krejt përjashtimet</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Kërkoni te kredenciale hyrjesh</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1271,6 +1279,8 @@
     <string name="saved_login_copy_username">Kopjo emër përdoruesi</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Kopjo sajtin</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Hape sajtin në shfletues</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Shfaqe fjalëkalimin</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1447,4 +1457,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, e mora vesh</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Shkurtore</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Kërkoni me</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Këtë herë kërko me:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Shfaqni shkurtore kërkimi</string>
+    </resources>
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index 983a3183c..c12273970 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -147,13 +147,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Pinday</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Takulan</string>
+    <string name="search_engines_shortcut_button">Mesin Pamaluruh</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">Setélan mesin pamaluruh</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Paluruh maké</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Saayeunaeun, paluruh maké:</string>
+    <string name="search_engines_search_with">Saayeunaeun, paluruh maké:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Eusian tutumbu tina papan klip</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +259,8 @@
     <string name="developer_tools_category">Parabot pamekar</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Debugging ti kajauhan liwat USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Témbongkeun takulan pamaluruhan</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Témbongkeun mesin pamaluruh</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Témbongkeun anjuran maluruh</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -579,6 +577,8 @@
     <string name="bookmark_select_folder">Pilih map</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Yakin anjeun rék mupus ieu folder?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s bakal mupus item anu dipilih.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Mupus %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -634,8 +634,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Mupus %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Mupus markah</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Mupus folder anu dipilih</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">BEDO</string>
 
@@ -730,6 +732,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d tab dipilih</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Tab diteundeun!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Koléksi diteundeun!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Tab disimpen!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -834,6 +838,10 @@
     <string name="qr_scanner_dialog_negative">HULAG</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Anjeun yakin rék mupus %1$s?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Mupus ieu tab bakal mupus sakabéh koléksi. Anjeun bisa nyieun koléksi anyar iraha baé.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Pupus %1$s?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Pupus</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1241,6 +1249,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Login jeung kecap sandi anu teu diteundeun bakal ditémbongkeun di dieu.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Login jeung kecap sandi moal diteundeun pikeun ieu loka.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Hapus sadaya pengecualian</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Paluruh login</string>
 
@@ -1280,6 +1290,8 @@
     <string name="saved_login_copy_username">Niron sandiasma</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Niron loka</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Buka loka dina pamaluruh</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Témbongkeun sandi</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1456,4 +1468,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Okéh, Ngarti</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Takulan</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Paluruh maké</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Saayeunaeun, paluruh maké:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Témbongkeun takulan pamaluruhan</string>
+    </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 60dc9e5a9..776df3fc4 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -25,6 +25,19 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s öppna flikar. Tryck för att växla mellan flikar.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">%1$d vald</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Lägg till ny samling</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Namn</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Välj samling</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Spara valda flikar i samlingen</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Valda</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s produceras av Mozilla.</string>
 
@@ -517,6 +530,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (Privat läge)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Spara</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Rensa historik</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index bfef1a9e8..f7ca022ca 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -25,6 +25,9 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s తెరిచివున్న ట్యాబులు. ట్యాబుల మధ్య మారడానికి తాకండి.</string>
 
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">పేరు</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s‌ని తయారుచేసినది మొజిల్లా.</string>
 
@@ -146,13 +149,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">స్కాన్ చేయి</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">సత్వరమార్గాలు</string>
+    <string name="search_engines_shortcut_button">శోధన యంత్రం</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">శోధన యంత్ర అమరికలు</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">దీనితో వెతుకు</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">ఈసారి దీనితో వెతుకు:</string>
+    <string name="search_engines_search_with">ఈ సారి దీనితో వెతుకు:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">క్లిప్‌బోర్డ్ నుండి లంకెను పూరించు</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -261,8 +262,8 @@
     <string name="developer_tools_category">డెవలపర్ పనిముట్లు</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB ద్వారా రిమోట్ డీబగ్గింగ్</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">శోధన సత్వరమార్గాలను చూపించు</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">శోధన యంత్రాలను చూపించు</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">వెతుకుడు సలహాలను చూపించు</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -514,6 +515,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (అంతరంగిక రీతి)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">భద్రపరుచు</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">చరిత్రను తొలగించు</string>
@@ -1477,4 +1481,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">సరే, అర్థమయ్యింది</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">సత్వరమార్గాలు</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">దీనితో వెతుకు</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">ఈసారి దీనితో వెతుకు:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">శోధన సత్వరమార్గాలను చూపించు</string>
+    </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 13a458b21..699530192 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -149,13 +149,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Tara</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Kısayollar</string>
+    <string name="search_engines_shortcut_button">Arama motoru</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">Arama motoru ayarları</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Bununla ara:</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Bir de bununla aramayı deneyin:</string>
+    <string name="search_engines_search_with">Bir de bununla aramayı deneyin:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Bağlantıyı panodan al</string>
 
@@ -263,8 +261,8 @@
     <string name="developer_tools_category">Geliştirici araçları</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">USB ile uzaktan hata ayıklama</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Arama kısayollarını göster</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Arama motorlarını göster</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Arama önerilerini göster</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -578,6 +576,8 @@
     <string name="bookmark_select_folder">Klasör seç</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Bu klasörü silmek istediğinizden emin misiniz?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s seçilen öğeleri silecek.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">%1$s silindi</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -632,8 +632,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">%1$s silindi</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Yer imleri silindi</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Seçilen klasörler siliniyor</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">GERİ AL</string>
 
@@ -727,6 +729,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d sekme seçildi</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Sekmeler kaydedildi!</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Koleksiyon kaydedildi!</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Sekme kaydedildi!</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -832,6 +836,10 @@
     <string name="qr_scanner_dialog_negative">İZİN VERME</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">%1$s koleksiyonunu silmek istediğinize emin misiniz?</string>
+    <!-- Collection and tab deletion prompt dialog message. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_message">Bu sekmeyi silerseniz tüm koleksiyon silinir. İstediğiniz zaman yeni koleksiyonlar oluşturabilirsiniz.</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">%1$s silinsin mi?</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Sil</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1229,6 +1237,8 @@
     <string name="preferences_passwords_exceptions_description_empty">Kaydedilmeyen hesaplar ve parolalar burada görünecektir.</string>
     <!-- Description of list of login exceptions that we never save logins for -->
     <string name="preferences_passwords_exceptions_description">Bu sitelere ait hesaplar ve parolalar kaydedilmeyecektir.</string>
+    <!-- Text on button to remove all saved login exceptions -->
+    <string name="preferences_passwords_exceptions_remove_all">Tüm istisnaları sil</string>
     <!-- Hint for search box in logins list -->
     <string name="preferences_passwords_saved_logins_search">Hesaplarda ara</string>
     <!-- Option to sort logins list A-Z, alphabetically -->
@@ -1267,6 +1277,8 @@
     <string name="saved_login_copy_username">Kullanıcı adını kopyala</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Siteyi kopyala</string>
+    <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
+    <string name="saved_login_open_site">Siteyi tarayıcıda aç</string>
     <!-- Content Description (for screenreaders etc) read for the button to reveal a password in logins -->
     <string name="saved_login_reveal_password">Parolayı göster</string>
     <!-- Content Description (for screenreaders etc) read for the button to hide a password in logins -->
@@ -1441,4 +1453,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Tamam</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Kısayollar</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Bununla ara:</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Bir de bununla aramayı deneyin:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Arama kısayollarını göster</string>
+    </resources>
diff --git a/app/src/main/res/values-trs/strings.xml b/app/src/main/res/values-trs/strings.xml
index ca74fd9e7..6e72de559 100644
--- a/app/src/main/res/values-trs/strings.xml
+++ b/app/src/main/res/values-trs/strings.xml
@@ -151,16 +151,8 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Nātsij hue\'ê</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Nānà\'uì\' a\'ngô hiūj u</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">Sa nagi\'iaj sa nānà\'ui\'i</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Nānà\'uì\' ngà</string>
-
-    <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Hìaj nī, nānà\'uì\' ngà:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Gāchrūn si enlasê portapâpel</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -275,8 +267,8 @@
     <string name="developer_tools_category">Rasūn nikāj desarroyadôr</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Guxūn sa kïj ï ngà USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Dīgân riña a\'ngô hiūj ga\'ue nānà\'uì\'</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Nāruguì’ nej sa nana’ui’i gīni’iājt</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Dīgân a\'ngô nuguan\' nikāj dugui\' ngà sa nana\'uî\'</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -595,6 +587,8 @@
     <string name="bookmark_select_folder">Nāguī karpêta</string>
     <!-- Confirmation message for a dialog confirming if the user wants to delete the selected folder -->
     <string name="bookmark_delete_folder_confirmation_dialog">Huā yītïnj ruhuât nādure\'t kārpetâ nan anj</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete multiple items including folders. Parameter will be replaced by app name. -->
+    <string name="bookmark_delete_multiple_folders_confirmation_dialog">%s nādure’ej nej sa naguit dan.</string>
     <!-- Snackbar title shown after a folder has been deleted. This first parameter is the name of the deleted folder -->
     <string name="bookmark_delete_folder_snackbar">Ngà nare\' %1$s</string>
     <!-- Screen title for adding a bookmarks folder -->
@@ -651,8 +645,10 @@
     <!-- Bookmark snackbar message on deletion
      The first parameter is the host part of the URL of the bookmark deleted, if any -->
     <string name="bookmark_deletion_snackbar_message">Ngà nare\' %1$s</string>
-    <!-- Bookmark snackbar message on deleting multiple bookmarks -->
+    <!-- Bookmark snackbar message on deleting multiple bookmarks not including folders-->
     <string name="bookmark_deletion_multiple_snackbar_message_2">Ngà nare\' nej sa arâj sun nīchrò\' doj</string>
+    <!-- Bookmark snackbar message on deleting multiple bookmarks including folders-->
+    <string name="bookmark_deletion_multiple_snackbar_message_3">Nādure’ nej karpetâ naguit</string>
     <!-- Bookmark undo button for deletion snackbar action -->
     <string name="bookmark_undo_deletion">NĀNIKÀJ RŪKÙ</string>
 
@@ -745,6 +741,8 @@
     <string name="create_collection_save_to_collection_tab_selected">%d rakïj ñanj naguit</string>
     <!-- Text shown in snackbar when multiple tabs have been saved in a collection -->
     <string name="create_collection_tabs_saved">Nej rakïj ñanj na\'nín sà\'t</string>
+    <!-- Text shown in snackbar when one or multiple tabs have been saved in a new collection -->
+    <string name="create_collection_tabs_saved_new_collection">Ngà nanun sà\' nej sa nachra chrē\'t</string>
     <!-- Text shown in snackbar when one tab has been saved in a collection -->
     <string name="create_collection_tab_saved">Rakïj ñanj na\'nïnj sà\'t</string>
     <!-- Content description (not visible, for screen readers etc.): button to close the collection creator -->
@@ -854,6 +852,8 @@
     <string name="qr_scanner_dialog_negative">SĪ GA\'NÏNJT</string>
     <!-- Tab collection deletion prompt dialog message. Placeholder will be replaced with the collection name -->
     <string name="tab_collection_dialog_message">Huā yītïnj ruhuât nādure\'t %1$s anj</string>
+    <!-- Collection and tab deletion prompt dialog title. Placeholder will be replaced with the collection name. This will show when the last tab from a collection is deleted -->
+    <string name="delete_tab_and_collection_dialog_title">Nādurê\'t %1$s raj</string>
     <!-- Tab collection deletion prompt dialog option to delete the collection -->
     <string name="tab_collection_dialog_positive">Nādūre\'</string>
     <!-- Tab collection deletion prompt dialog option to cancel deleting the collection -->
@@ -1491,4 +1491,15 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">Ga\'ue, ngà garâj da\'nga\' ruhuâj</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Nānà\'uì\' a\'ngô hiūj u</string>
+
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Nānà\'uì\' ngà</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Hìaj nī, nānà\'uì\' ngà:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Dīgân riña a\'ngô hiūj ga\'ue nānà\'uì\'</string>
+    </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2752cf6ed..dc26ad8cf 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -24,6 +24,29 @@
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
     <string name="open_tab_tray_plural">%1$s відкритих вкладок. Торкніться, щоб перемкнути вкладки.</string>
 
+    <!-- Tab tray multi select title in app bar. The first parameter is the number of tabs selected -->
+    <string name="tab_tray_multi_select_title">Вибрано %1$d</string>
+    <!-- Label of button in create collection dialog for creating a new collection  -->
+    <string name="tab_tray_add_new_collection">Додати нову збірку</string>
+    <!-- Label of editable text in create collection dialog for naming a new collection  -->
+    <string name="tab_tray_add_new_collection_name">Назва</string>
+    <!-- Label of button in save to collection dialog for selecting a current collection  -->
+    <string name="tab_tray_select_collection">Вибрати збірку</string>
+    <!-- Content description for close button while in multiselect mode in tab tray -->
+    <string name="tab_tray_close_multiselect_content_description">Вихід з режиму вибору</string>
+    <!-- Content description for save to collection button while in multiselect mode in tab tray -->
+    <string name="tab_tray_collection_button_multiselect_content_description">Зберегти вибрані вкладки до збірки</string>
+    <!-- Content description for checkmark while tab is selected while in multiselect mode in tab tray. The first parameter is the title of the tab selected -->
+    <string name="tab_tray_item_selected_multiselect_content_description">Вибрано %1$s</string>
+    <!-- Content description when tab is unselected while in multiselect mode in tab tray. The first parameter is the title of the tab unselected -->
+    <string name="tab_tray_item_unselected_multiselect_content_description">Скасовано вибір %1$s</string>
+    <!-- Content description announcement when exiting multiselect mode in tab tray -->
+    <string name="tab_tray_exit_multiselect_content_description">Режим вибору вимкнено</string>
+    <!-- Content description announcement when entering multiselect mode in tab tray -->
+    <string name="tab_tray_enter_multiselect_content_description">Режим вибору ввімкнено, виберіть які вкладки зберегти до збірки</string>
+    <!-- Content description on checkmark while tab is selected in multiselect mode in tab tray -->
+    <string name="tab_tray_multiselect_selected_content_description">Вибрано</string>
+
     <!-- About content. The first parameter is the name of the application. (For example: Fenix) -->
     <string name="about_content">%1$s розроблено Mozilla.</string>
 
@@ -517,6 +540,9 @@
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
     <string name="pwa_site_controls_title_private">%1$s (Приватний режим)</string>
 
+    <!-- Button in the current tab tray header in multiselect mode. Saved the selected tabs to a collection when pressed. -->
+    <string name="tab_tray_save_to_collection">Зберегти</string>
+
     <!-- History -->
     <!-- Text for the button to clear all history -->
     <string name="history_delete_all">Видалити історію</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 1097f7c84..082743f14 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -143,14 +143,10 @@
     <!-- Search Fragment -->
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Tekshirish</string>
-    <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Yorliqlar</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">Qidiruv tizimi sozlamalari</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Izlash:</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">Bu safar quyidagi bilan izlash:</string>
+    <string name="search_engines_search_with">Bu safar quyidagi bilan izlash:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Havolani klipboarddan olish</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -230,6 +226,74 @@
     <!-- Preference to override the Sync token server -->
     <string name="preferences_override_sync_tokenserver">Boshqa Sync serveri</string>
 
+    <!-- Toast shown after updating the FxA/Sync server override preferences -->
+    <string name="toast_override_fxa_sync_server_done">Firefox hisobi/Sync serveri oʻzgargan. Oʻzgarishlar amalga oshirshi uchun ilovadan chiqilmoqda…</string>
+    <!-- Preference category for account information -->
+    <string name="preferences_category_account">Hisob</string>
+    <!-- Preference shown on banner to sign into account -->
+    <string name="preferences_sign_in">Kirish</string>
+    <!-- Preference for changing where the toolbar is positioned -->
+    <string name="preferences_toolbar">Asboblar paneli</string>
+    <!-- Preference for changing default theme to dark or light mode -->
+    <string name="preferences_theme">Mavzu</string>
+    <!-- Preference for settings related to visual options -->
+    <string name="preferences_customize">Moslash</string>
+    <!-- Preference description for banner about signing in -->
+    <string name="preferences_sign_in_description">Xatchoʻplar va tarix kabilarni Firefox hisobingiz bilan sinxronlang</string>
+    <!-- Preference shown instead of account display name while account profile information isn't available yet. -->
+    <string name="preferences_account_default_name">Firefox hisobi</string>
+    <!-- Preference text for account title when there was an error syncing FxA -->
+    <string name="preferences_account_sync_error">Sinxronlashni davom ettirish uchun qayta ulaning</string>
+    <!-- Preference for language -->
+    <string name="preferences_language">Til</string>
+    <!-- Preference for data choices -->
+    <string name="preferences_data_choices">Maʼlumotlarni tanlash</string>
+    <!-- Preference for data collection -->
+    <string name="preferences_data_collection">Maʼlumotlarni toʻplash</string>
+    <!-- Preference linking to the privacy notice -->
+    <string name="preferences_privacy_link">Maxfiylik eslatmalari</string>
+    <!-- Preference category for developer tools -->
+    <string name="developer_tools_category">Dasturchi asboblari</string>
+    <!-- Preference for developers -->
+    <string name="preferences_remote_debugging">USB orqali masofadan nosozlikni tuzatish</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Qidiruv tizimlarini koʻrsatish</string>
+    <!-- Preference title for switch preference to show search suggestions -->
+    <string name="preferences_show_search_suggestions">Qidiruv tavsiyalarini koʻrsatish</string>
+    <!-- Preference title for switch preference to show voice search button -->
+    <string name="preferences_show_voice_search">Ovozli qidiruvni koʻrsatish</string>
+    <!-- Preference title for switch preference to show search suggestions also in private mode -->
+    <string name="preferences_show_search_suggestions_in_private">Maxfiy seanslarda koʻrsatish</string>
+    <!-- Preference title for switch preference to show a clipboard suggestion when searching -->
+    <string name="preferences_show_clipboard_suggestions">Klipboard tavsiyalarni koʻrsatish</string>
+    <!-- Preference title for switch preference to suggest browsing history when searching -->
+    <string name="preferences_search_browsing_history">Brauzer tarixidan izlash</string>
+    <!-- Preference title for switch preference to suggest bookmarks when searching -->
+    <string name="preferences_search_bookmarks">Xatchoʻplarni izlash</string>
+    <!-- Preference for account settings -->
+    <string name="preferences_account_settings">Hisob sozlamalari</string>
+    <!-- Preference for open links in third party apps -->
+    <string name="preferences_open_links_in_apps">Havolalarni ilovalarda ochish</string>
+    <!-- Preference for add_ons -->
+    <string name="preferences_addons">Qoʻshimcha dasturlar</string>
+
+    <!-- Account Preferences -->
+    <!-- Preference for triggering sync -->
+    <string name="preferences_sync_now">Hozir sinxronlash</string>
+    <!-- Preference category for sync -->
+    <string name="preferences_sync_category">Nimani sinxronlashni tanlang</string>
+    <!-- Preference for syncing history -->
+    <string name="preferences_sync_history">Tarix</string>
+    <!-- Preference for syncing bookmarks -->
+    <string name="preferences_sync_bookmarks">Xatchoʻplar</string>
+    <!-- Preference for syncing logins -->
+    <string name="preferences_sync_logins">Loginlar</string>
+    <!-- Preference for syncing tabs -->
+    <string name="preferences_sync_tabs_2">Varaqlarni ochish</string>
+    <!-- Preference for signing out -->
+    <string name="preferences_sign_out">Chiqish</string>
+    <!-- Preference displays and allows changing current FxA device name -->
+    <string name="preferences_sync_device_name">Qurilma nomi</string>
     <!-- Text shown when user enters empty device name -->
     <string name="empty_device_name_error">Qurilma nomi boʻsh boʻlishi mumkin emas.</string>
     <!-- Label indicating that sync is in progress -->
@@ -249,6 +313,10 @@
         and the third is the device model. -->
     <string name="default_device_name_2">%1$s, %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">Qabul qilingan varaqlar</string>
+
     <!-- Accessibility description text for a completed migration item -->
     <string name="migration_icon_description">Koʻchirish tugadi</string>
     <!--Text on list of migrated items (e.g. Settings, History, etc.)-->
@@ -340,4 +408,11 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, tushundim</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Yorliqlar</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Izlash:</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">Bu safar quyidagi bilan izlash:</string>
+    </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 65fdc0699..e9c75f5dd 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -149,13 +149,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">Quét</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">Tìm kiếm</string>
+    <string name="search_engines_shortcut_button">Công cụ tìm kiếm</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">Cài đặt công cụ tìm kiếm</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">Tìm kiếm với</string>
     <!-- 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>
+    <string name="search_engines_search_with">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ừ bộ nhớ tạm</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->
@@ -262,8 +260,8 @@
     <string name="developer_tools_category">Công cụ dành cho nhà phát triển</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Gỡ lỗi từ xa qua USB</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">Hiển thị các lối tắt tìm kiếm</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">Hiển thị công cụ tìm kiếm</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Hiển thị gợi ý tìm kiếm</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1449,4 +1447,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">OK, đã hiểu</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">Tìm kiếm</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">Tìm kiếm với</string>
+    <!-- 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>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">Hiển thị các lối tắt tìm kiếm</string>
+    </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d1e4e6f10..2ebd74c23 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -154,15 +154,12 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">扫码</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">快捷操作</string>
+    <string name="search_engines_shortcut_button">搜索引擎</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">搜索引擎设置</string>
 
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">可选用下列引擎搜索</string>
-
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">更多搜索引擎：</string>
+    <string name="search_engines_search_with">更多搜索引擎：</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">打开剪贴板中的链接</string>
 
@@ -260,7 +257,7 @@
     <!-- Preference text for account title when there was an error syncing FxA -->
     <string name="preferences_account_sync_error">重新连接以恢复同步</string>
     <!-- Preference for language -->
-    <string name="preferences_language">语言</string>
+    <string name="preferences_language">语言(地区)</string>
     <!-- Preference for data choices -->
     <string name="preferences_data_choices">数据反馈</string>
     <!-- Preference for data collection -->
@@ -271,8 +268,8 @@
     <string name="developer_tools_category">开发者工具</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">通过 USB 远程调试</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">显示搜索快捷操作</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">显示搜索引擎</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">显示搜索建议</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1493,4 +1490,14 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">我知道了</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">快捷操作</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">可选用下列引擎搜索</string>
+
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">更多搜索引擎：</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">显示搜索快捷操作</string>
+    </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 001d531d5..28cbb7df7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -152,13 +152,11 @@
     <!-- Button in the search view that lets a user search by scanning a QR code -->
     <string name="search_scan_button">掃描</string>
     <!-- Button in the search view that lets a user search by using a shortcut -->
-    <string name="search_shortcuts_button">捷徑</string>
+    <string name="search_engines_shortcut_button">搜尋引擎</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">搜尋引擎設定</string>
-    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with">使用下列引擎搜尋</string>
     <!-- Header displayed when selecting a shortcut search engine -->
-    <string name="search_shortcuts_search_with_2">這次使用下列搜尋引擎搜尋:</string>
+    <string name="search_engines_search_with">這次使用下列搜尋引擎搜尋:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">開啟剪貼簿中的鏈結</string>
 
@@ -268,8 +266,8 @@
 
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">透過 USB 進行遠端除錯</string>
-    <!-- Preference title for switch preference to show search shortcuts -->
-    <string name="preferences_show_search_shortcuts">顯示搜尋捷徑</string>
+    <!-- Preference title for switch preference to show search engines -->
+    <string name="preferences_show_search_engines">顯示搜尋引擎</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">顯示搜尋建議</string>
     <!-- Preference title for switch preference to show voice search button -->
@@ -1483,4 +1481,13 @@
     <!-- Confirmation dialog button text when top sites limit is reached. -->
     <string name="top_sites_max_limit_confirmation_button">好，知道了！</string>
 
-</resources>
+    <!-- DEPRECATED STRINGS -->
+    <!-- Button in the search view that lets a user search by using a shortcut -->
+    <string name="search_shortcuts_button">捷徑</string>
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with">使用下列引擎搜尋</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">這次使用下列搜尋引擎搜尋:</string>
+    <!-- Preference title for switch preference to show search shortcuts -->
+    <string name="preferences_show_search_shortcuts">顯示搜尋捷徑</string>
+    </resources>

From 53a4f63393aba2b92603375820ebb1738f1918ea Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Mon, 27 Jul 2020 22:27:06 -0400
Subject: [PATCH 04/20] For #12983: Fix deep link scheme for nightly builds

When we simplified our variants, our deep link scheme for nightly was
lost.
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7a1c54f9b..ad79842d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,7 +75,7 @@ android {
         fenixProduction releaseTemplate >> {
             applicationIdSuffix ".fenix"
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
-            def deepLinkSchemeValue = "fenix"
+            def deepLinkSchemeValue = "fenix-nightly"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
             manifestPlaceholders = ["deepLinkScheme": deepLinkSchemeValue]
         }

From b0dfdd57dccb7059ee20ae344f30646dd1248898 Mon Sep 17 00:00:00 2001
From: Oana Horvath <oana.horvath@softvision.ro>
Date: Tue, 28 Jul 2020 16:22:46 +0300
Subject: [PATCH 05/20] For #12968: Re-enables Search settings tests (#13020)

---
 app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt     | 1 -
 .../androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
index f06d5b623..a57ec57c7 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -66,7 +66,6 @@ class SearchTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/12968")
     @Test
     fun shortcutSearchEngineSettingsTest() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
index de4ddd79f..ee20a2c55 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
@@ -60,7 +60,6 @@ class SettingsBasicsTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/12968")
     @Test
     // Walks through settings menu and sub-menus to ensure all items are present
     fun settingsMenuBasicsItemsTests() {
@@ -91,7 +90,6 @@ class SettingsBasicsTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/12968")
     @Test
     fun selectNewDefaultSearchEngine() {
         // Goes through the settings and changes the default search engine, then verifies it has changed.

From 1e0af30802dc849e654c4804b189361e36232ed4 Mon Sep 17 00:00:00 2001
From: MickeyMoz <sebastian@mozilla.com>
Date: Tue, 28 Jul 2020 14:05:21 +0000
Subject: [PATCH 06/20] Update Android Components version to
 52.0.20200728130711.

---
 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 bf883d967..a7e27b58b 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 = "52.0.20200727130115"
+    const val VERSION = "52.0.20200728130711"
 }

From b7fabdd2f18fe57499ce49bbeabcff4c8db8d28e Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 27 Jul 2020 19:03:45 -0400
Subject: [PATCH 07/20] Closes #12670: Add lastUri as a parameter in
 RequestInterceptor

---
 .../java/org/mozilla/fenix/AppRequestInterceptor.kt            | 3 ++-
 app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
index 906e84f6b..c16ee4d63 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -20,6 +20,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,
+        lastUri: String?,
         hasUserGesture: Boolean,
         isSameDomain: Boolean,
         isRedirect: Boolean,
@@ -27,7 +28,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         isSubframeRequest: Boolean
     ): RequestInterceptor.InterceptionResponse? {
         return appContext.components.services.accountsAuthFeature.interceptor.onLoadRequest(
-            engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
+            engineSession, uri, lastUri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
         )
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
index 85057009a..312460f1d 100644
--- a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
+++ b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -19,6 +19,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,
+        lastUri: String?,
         hasUserGesture: Boolean,
         isSameDomain: Boolean,
         isRedirect: Boolean,
@@ -27,7 +28,7 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
     ): RequestInterceptor.InterceptionResponse? {
         return context.components.services.appLinksInterceptor
             .onLoadRequest(
-                engineSession, uri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
+                engineSession, uri, lastUri, hasUserGesture, isSameDomain, isRedirect, isDirectNavigation, isSubframeRequest
             )
     }
 

From 272c380755ae594ab7ee70d725d9594381c99dfe Mon Sep 17 00:00:00 2001
From: Kainalu Hagiwara <kainaluh808@gmail.com>
Date: Tue, 28 Jul 2020 09:41:51 -0700
Subject: [PATCH 08/20] For #13028 - Add feature flag for tab history.

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt        | 5 +++++
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt  | 7 +++++--
 .../fenix/components/toolbar/BrowserToolbarController.kt   | 7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 9fcc47586..d37025e14 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -33,4 +33,9 @@ object FeatureFlags {
      * Enables swipe on toolbar to switch tabs
      */
     val swipeToSwitchTabs = Config.channel.isNightlyOrDebug
+
+    /**
+     * Enables viewing tab history
+     */
+    val tabHistory = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 831acd06c..88e151f17 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -766,8 +766,11 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     }
 
     override fun onBackLongPressed(): Boolean {
-        findNavController().navigate(R.id.action_global_tabHistoryDialogFragment)
-        return true
+        if (FeatureFlags.tabHistory) {
+            findNavController().navigate(R.id.action_global_tabHistoryDialogFragment)
+            return true
+        }
+        return false
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 54e342daf..7851cb05f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -23,6 +23,7 @@ import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.kotlin.isUrl
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
@@ -172,10 +173,12 @@ class DefaultBrowserToolbarController(
         Do exhaustive when (item) {
             ToolbarMenu.Item.Back -> sessionUseCases.goBack.invoke(currentSession)
             is ToolbarMenu.Item.Forward -> {
-                if (item.viewHistory) {
+                if (FeatureFlags.tabHistory && item.viewHistory) {
                     navController.navigate(R.id.action_global_tabHistoryDialogFragment)
-                } else {
+                } else if (!item.viewHistory) {
                     sessionUseCases.goForward.invoke(currentSession)
+                } else {
+                    // Do nothing if tab history feature flag is off and item.viewHistory is true
                 }
             }
             is ToolbarMenu.Item.Reload -> {

From 5b997ff1d889a855f3a3ccad949e0747ef54201b Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Tue, 28 Jul 2020 11:33:57 -0400
Subject: [PATCH 09/20] Closes #13021: Fix verifyAboutFirefoxPreview UI test

---
 .../org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
index d7d7ce3d6..4e6a9e3ef 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
@@ -64,6 +64,11 @@ private fun assertFirefoxPreviewPage() {
 }
 
 private fun navigateBackToAboutPage(itemToInteract: () -> Unit) {
+    browserScreen {
+    }.openTabDrawer {
+        closeTab()
+    }
+
     homeScreen {
     }.openThreeDotMenu {
     }.openSettings {

From 12e68ac18d3ddd23c25bd3a6605b6a05500d3323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hakk=C4=B1=20Kaan=20=C3=87al=C4=B1=C5=9Fkan?=
 <caliskanhkaan@gmail.com>
Date: Thu, 23 Jul 2020 15:09:40 +0300
Subject: [PATCH 10/20] For #12622: Visually indicate different types of
 suggestions in the search screen

---
 .../fenix/search/awesomebar/AwesomeBarView.kt      |  2 ++
 .../res/drawable/ic_search_results_bookmarks.xml   | 14 ++++++++++++++
 .../drawable/ic_search_results_device_desktop.xml  | 14 ++++++++++++++
 .../drawable/ic_search_results_device_mobile.xml   | 14 ++++++++++++++
 .../drawable/ic_search_results_device_tablet.xml   | 14 ++++++++++++++
 .../main/res/drawable/ic_search_results_tab.xml    | 14 ++++++++++++++
 app/src/main/res/values-night/colors.xml           |  2 ++
 app/src/main/res/values/attrs.xml                  |  2 ++
 app/src/main/res/values/colors.xml                 |  6 ++++++
 app/src/main/res/values/styles.xml                 |  4 ++++
 10 files changed, 86 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_search_results_bookmarks.xml
 create mode 100644 app/src/main/res/drawable/ic_search_results_device_desktop.xml
 create mode 100644 app/src/main/res/drawable/ic_search_results_device_mobile.xml
 create mode 100644 app/src/main/res/drawable/ic_search_results_device_tablet.xml
 create mode 100644 app/src/main/res/drawable/ic_search_results_tab.xml

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 1172d0192..0a0382936 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -106,6 +106,7 @@ class AwesomeBarView(
                 components.core.store,
                 selectTabUseCase,
                 components.core.icons,
+                getDrawable(context, R.drawable.ic_search_results_tab),
                 excludeSelectedSession = true
             )
 
@@ -122,6 +123,7 @@ class AwesomeBarView(
                 bookmarksStorage = components.core.bookmarksStorage,
                 loadUrlUseCase = loadUrlUseCase,
                 icons = components.core.icons,
+                indicatorIcon = getDrawable(context, R.drawable.ic_search_results_bookmarks),
                 engine = engineForSpeculativeConnects
             )
 
diff --git a/app/src/main/res/drawable/ic_search_results_bookmarks.xml b/app/src/main/res/drawable/ic_search_results_bookmarks.xml
new file mode 100644
index 000000000..4bf1e5c91
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_results_bookmarks.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20">
+    <path android:fillColor="?attr/foundation"
+        android:pathData="M9.697 0.007c-1.094 0.072-2.075 0.72-2.568 1.71l-1.48 2.965-3.09 0.552C1.446 5.43 0.522 6.223 0.161 7.301L0.1 7.505c-0.268 1.022 0.005 2.117 0.732 2.897l2.276 2.447-0.476 3.419c-0.161 1.15 0.335 2.294 1.285 2.963l0.181 0.119c0.924 0.558 2.078 0.599 3.043 0.093l2.759-1.44 2.766 1.444c1.027 0.538 2.271 0.457 3.222-0.213l0.162-0.123c0.844-0.68 1.274-1.758 1.122-2.841l-0.478-3.421 2.278-2.449c0.774-0.828 1.032-2.018 0.671-3.097l-0.069-0.186c-0.397-0.975-1.267-1.687-2.312-1.879l-3.108-0.556-1.477-2.965C12.153 0.665 11.078 0 9.903 0z"/>
+    <path android:fillColor="?attr/awesomeBarIndicatorBookmarkColor"
+        android:pathData="M9.903 2c0.371 0 0.713 0.186 0.916 0.49l0.069 0.12 1.926 3.864 4.089 0.731c0.394 0.073 0.718 0.353 0.845 0.733 0.114 0.34 0.054 0.712-0.154 0.998l-0.085 0.102-2.926 3.146 0.61 4.363c0.057 0.409-0.119 0.815-0.456 1.052-0.3 0.211-0.682 0.258-1.02 0.131l-0.124-0.056-3.69-1.927-3.69 1.924c-0.365 0.192-0.806 0.163-1.143-0.075-0.3-0.21-0.472-0.555-0.467-0.916l0.01-0.136 0.61-4.36-2.927-3.147C2.02 8.742 1.929 8.32 2.057 7.937c0.114-0.34 0.386-0.6 0.724-0.703l0.13-0.03 4.08-0.73L8.92 2.61C9.105 2.236 9.486 2 9.903 2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_results_device_desktop.xml b/app/src/main/res/drawable/ic_search_results_device_desktop.xml
new file mode 100644
index 000000000..3f028b995
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_results_device_desktop.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20">
+    <path android:fillColor="?attr/foundation"
+        android:pathData="M16 2c1.598 0 2.904 1.249 2.995 2.824L19 5v7.501l0.098 0.076c0.465 0.387 0.788 0.94 0.877 1.568l0.02 0.19L20 14.5v1c0 1.326-1.032 2.41-2.336 2.495L17.5 18h-15c-1.325 0-2.41-1.032-2.495-2.336L0 15.5v-1c0-0.709 0.295-1.349 0.769-1.804l0.133-0.119L1 12.5V5c0-1.538 1.158-2.807 2.65-2.98l0.174-0.015L4 2z"/>
+    <path android:fillColor="?attr/awesomeBarIndicatorColor"
+        android:pathData="M16 4l0.117 0.007c0.42 0.049 0.762 0.359 0.857 0.764l0.02 0.112L17 5v9h0.5l0.09 0.008c0.175 0.032 0.318 0.155 0.379 0.318l0.023 0.084L18 14.5v1l-0.008 0.09c-0.032 0.175-0.155 0.318-0.318 0.379l-0.084 0.023L17.5 16h-15l-0.09-0.008c-0.175-0.032-0.318-0.155-0.379-0.318L2.008 15.59 2 15.5v-1l0.008-0.09c0.032-0.175 0.154-0.318 0.318-0.379l0.084-0.023L2.5 14H3V5l0.007-0.117c0.049-0.42 0.359-0.762 0.764-0.857l0.112-0.02L4 4zm-4 10H8v1h4zm3-8H5v7h10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_results_device_mobile.xml b/app/src/main/res/drawable/ic_search_results_device_mobile.xml
new file mode 100644
index 000000000..83d6999b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_results_device_mobile.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20">
+    <path android:fillColor="?attr/foundation"
+        android:pathData="M6 0h8a4 4 0 0 1 4 4v12a4 4 0 0 1-4 4H6a4 4 0 0 1-4-4V4a4 4 0 0 1 4-4z"/>
+    <path android:fillColor="?attr/awesomeBarIndicatorColor"
+        android:pathData="M14 2H6C4.895 2 4 2.895 4 4v12c0 1.105 0.895 2 2 2h8c1.105 0 2-0.895 2-2V4c0-1.105-0.895-2-2-2zm-3 15H9v-1h2zm3-2.5c0 0.276-0.224 0.5-0.5 0.5h-7C6.224 15 6 14.776 6 14.5v-10C6 4.224 6.224 4 6.5 4h7C13.776 4 14 4.224 14 4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_results_device_tablet.xml b/app/src/main/res/drawable/ic_search_results_device_tablet.xml
new file mode 100644
index 000000000..276cc2b33
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_results_device_tablet.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20">
+    <path android:fillColor="?attr/foundation"
+        android:pathData="M4 1h12c2.21 0 4 1.79 4 4v10c0 2.21-1.79 4-4 4H4c-2.21 0-4-1.79-4-4V5c0-2.21 1.79-4 4-4z"/>
+    <path android:fillColor="?attr/awesomeBarIndicatorColor"
+        android:pathData="M16 3H4C2.895 3 2 3.895 2 5v10c0 1.105 0.895 2 2 2h12c1.105 0 2-0.895 2-2V5c0-1.105-0.895-2-2-2zm-1 11.5c0 0.276-0.224 0.5-0.5 0.5h-10C4.224 15 4 14.776 4 14.5v-9C4 5.224 4.224 5 4.5 5h10C14.776 5 15 5.224 15 5.5zm2-3.5h-1V9h1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_results_tab.xml b/app/src/main/res/drawable/ic_search_results_tab.xml
new file mode 100644
index 000000000..c290b982f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_results_tab.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20">
+    <path android:fillColor="?attr/foundation"
+        android:pathData="M6 3L5.8 3.005C3.684 3.109 2 4.858 2 7v4.17l-0.012 0.005C0.83 11.59 0 12.698 0 14c0 1.657 1.343 3 3 3h14c1.657 0 3-1.343 3-3l-0.005-0.176c-0.067-1.157-0.79-2.138-1.802-2.577L18 11.17V7c0-2.21-1.79-4-4-4z"/>
+    <path android:fillColor="?attr/awesomeBarIndicatorColor"
+        android:pathData="M14 5c1.054 0 1.918 0.816 1.994 1.85L16 7v6h1c0.552 0 1 0.448 1 1 0 0.513-0.386 0.935-0.883 0.993L17 15H3c-0.552 0-1-0.448-1-1 0-0.513 0.386-0.935 0.883-0.993L3 13h1V7c0-1.054 0.816-1.918 1.85-1.994L6 5z"/>
+</vector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1d5ee0a68..8fc545e42 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -47,6 +47,8 @@
     <color name="prompt_login_edit_text_cursor_color_normal_theme">@color/prompt_login_edit_text_cursor_color_dark_theme</color>
     <color name="readermode_start_gradient_normal_theme">#C689FF</color>
     <color name="readermode_end_gradient_normal_theme">#00B3F4</color>
+    <color name="search_suggestion_indicator_icon_color_normal_theme">@color/search_suggestion_indicator_icon_color_dark_theme</color>
+    <color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</color>
 
     <!-- Tab tray -->
     <color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f3ed115f1..35eb091d7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -52,6 +52,8 @@
     <attr name="readerModeStartGradient" format="reference"/>
     <attr name="readerModeEndGradient" format="reference"/>
     <attr name="syncedTabsSeparator" format="reference"/>
+    <attr name="awesomeBarIndicatorColor" format="reference|color"/>
+    <attr name="awesomeBarIndicatorBookmarkColor" format="reference|color"/>
 
     <!-- Tab tray -->
     <attr name="tabTrayItemMediaBackground" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 619a14af1..9a22639e5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -71,6 +71,8 @@
     <color name="prompt_login_edit_text_cursor_color_light_theme">#312a64</color>
     <color name="readermode_start_gradient_normal_theme">#FF9059ff</color>
     <color name="readermode_end_gradient_normal_theme">#FF0250bb</color>
+    <color name="search_suggestion_indicator_icon_color_light_theme">#008787</color>
+    <color name="search_suggestion_indicator_icon_bookmark_color_light_theme">#0060df</color>
 
     <!-- Tab Tray -->
     <color name="tab_tray_item_text_light_theme">@color/ink_80</color>
@@ -132,6 +134,8 @@
     <color name="add_on_private_browsing_exterior_circle_background_dark_theme">@color/accent_dark_theme</color>
     <color name="add_on_private_browsing_interior_icon_background_dark_theme">#FFFFFF</color>
     <color name="prompt_login_edit_text_cursor_color_dark_theme">#9059ff</color>
+    <color name="search_suggestion_indicator_icon_color_dark_theme">#2ac3a2</color>
+    <color name="search_suggestion_indicator_icon_bookmark_color_dark_theme">#0090ed</color>
 
     <!-- Tab Tray -->
     <color name="tab_tray_item_text_dark_theme">@color/light_grey_05</color>
@@ -238,6 +242,8 @@
     <color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/add_on_private_browsing_exterior_circle_background_light_theme</color>
     <color name="add_on_private_browsing_interior_icon_background_normal_theme">@color/add_on_private_browsing_interior_icon_background_light_theme</color>
     <color name="prompt_login_edit_text_cursor_color_normal_theme">@color/prompt_login_edit_text_cursor_color_light_theme</color>
+    <color name="search_suggestion_indicator_icon_color_normal_theme">@color/search_suggestion_indicator_icon_color_light_theme</color>
+    <color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/search_suggestion_indicator_icon_bookmark_color_light_theme</color>
 
     <!-- Tab tray -->
     <color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_light_theme</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b675efc7..a11de8c72 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -77,6 +77,8 @@
         <item name="readerModeStartGradient">@color/readermode_start_gradient_normal_theme</item>
         <item name="readerModeEndGradient">@color/readermode_end_gradient_normal_theme</item>
         <item name="syncedTabsSeparator">@color/synced_tabs_separator</item>
+        <item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_normal_theme</item>
+        <item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_normal_theme</item>
 
         <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
         <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item>
@@ -208,6 +210,8 @@
         <item name="addOnPrivateBrowsingExteriorCircleBackground">@color/add_on_private_browsing_exterior_circle_background_private_theme</item>
         <item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_private_theme</item>
         <item name="mozacPromptLoginEditTextCursorColor">@color/prompt_login_edit_text_cursor_color_private_theme</item>
+        <item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_dark_theme</item>
+        <item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</item>
 
         <!-- Tab Tray -->
         <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>

From 33bb86b1aa945f8224b152e750d4da9924fe5733 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 27 Jul 2020 15:01:42 -0400
Subject: [PATCH 11/20] For #12992 - Hide tab close button while in multiselect
 mode

---
 .../mozilla/fenix/tabtray/FenixTabsAdapter.kt |  1 +
 .../org/mozilla/fenix/tabtray/TabTrayView.kt  | 36 ++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/FenixTabsAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabtray/FenixTabsAdapter.kt
index 76e85669f..ebea8e3ed 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/FenixTabsAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/FenixTabsAdapter.kt
@@ -104,5 +104,6 @@ class FenixTabsAdapter(
             mode is TabTrayDialogFragmentState.Mode.MultiSelect && selectedItems.contains(tab)
         view.checkmark.isVisible = shouldBeChecked
         view.selected_mask.isVisible = shouldBeChecked
+        view.mozac_browser_tabstray_close.isVisible = mode is TabTrayDialogFragmentState.Mode.Normal
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index b580a239f..ee5d13bef 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.launch
 import mozilla.components.browser.menu.BrowserMenu
 import mozilla.components.browser.menu.BrowserMenuBuilder
 import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
+import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
@@ -248,12 +249,15 @@ class TabTrayView(
     fun updateState(state: TabTrayDialogFragmentState) {
         val oldMode = mode
 
-        if (oldMode::class != state.mode::class && view.context.settings().accessibilityServicesEnabled) {
-            view.announceForAccessibility(
-                if (state.mode == TabTrayDialogFragmentState.Mode.Normal) view.context.getString(
-                    R.string.tab_tray_exit_multiselect_content_description
-                ) else view.context.getString(R.string.tab_tray_enter_multiselect_content_description)
-            )
+        if (oldMode::class != state.mode::class) {
+            updateTabsForModeChanged()
+            if (view.context.settings().accessibilityServicesEnabled) {
+                view.announceForAccessibility(
+                    if (state.mode == TabTrayDialogFragmentState.Mode.Normal) view.context.getString(
+                        R.string.tab_tray_exit_multiselect_content_description
+                    ) else view.context.getString(R.string.tab_tray_enter_multiselect_content_description)
+                )
+            }
         }
 
         mode = state.mode
@@ -275,7 +279,7 @@ class TabTrayView(
 
                 fabView.new_tab_button.isVisible = false
                 view.tab_tray_new_tab.isVisible = false
-                view.collect_multi_select.isVisible = state.mode.selectedItems.size > 0
+                view.collect_multi_select.isVisible = state.mode.selectedItems.isNotEmpty()
 
                 view.multiselect_title.text = view.context.getString(
                     R.string.tab_tray_multi_select_title,
@@ -391,13 +395,21 @@ class TabTrayView(
         view.tab_layout.isVisible = !multiselect
     }
 
+    private fun updateTabsForModeChanged() {
+        view.tabsTray.apply {
+            val tabs = view.context.components.core.store.state.getNormalOrPrivateTabs(
+                isPrivateModeSelected
+            )
+
+            this.adapter?.notifyItemRangeChanged(0, tabs.size, true)
+        }
+    }
+
     private fun updateTabsForSelectionChanged(itemId: String) {
         view.tabsTray.apply {
-            val tabs = if (isPrivateModeSelected) {
-                view.context.components.core.store.state.privateTabs
-            } else {
-                view.context.components.core.store.state.normalTabs
-            }
+            val tabs = view.context.components.core.store.state.getNormalOrPrivateTabs(
+                isPrivateModeSelected
+            )
 
             val selectedBrowserTabIndex = tabs.indexOfFirst { it.id == itemId }
 

From 239e3de5e9ed7f04593aed89fc24b4f30b80a8ff Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Mon, 27 Jul 2020 21:55:09 -0400
Subject: [PATCH 12/20] For #12856: Add save to collections button to Tabs Tray

Using the ConcatAdapter, we're now able to insert multiple data sources
of information into one RecyclerView and preserve layout/scrolling in
addition to adding the 'Save to Collection' button.
---
 .../fenix/migration/MigrationStatusAdapter.kt |   2 +-
 .../tabtray/SaveToCollectionsButtonAdapter.kt |  67 +++++++
 .../org/mozilla/fenix/tabtray/TabTrayView.kt  |  17 +-
 .../mozilla/fenix/tabtray/TabsTouchHelper.kt  | 168 +++++++++++-------
 .../tabs_tray_save_to_collections_item.xml    |  11 ++
 .../SaveToCollectionsButtonAdapterTest.kt     |  53 ++++++
 .../fenix/tabtray/TabsTouchHelperTest.kt      |  55 ++++++
 buildSrc/src/main/java/Dependencies.kt        |   2 +-
 8 files changed, 305 insertions(+), 70 deletions(-)
 create mode 100644 app/src/main/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapter.kt
 create mode 100644 app/src/main/res/layout/tabs_tray_save_to_collections_item.xml
 create mode 100644 app/src/test/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapterTest.kt
 create mode 100644 app/src/test/java/org/mozilla/fenix/tabtray/TabsTouchHelperTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationStatusAdapter.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationStatusAdapter.kt
index 39ddc3405..34f55e59c 100644
--- a/app/src/main/java/org/mozilla/fenix/migration/MigrationStatusAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/migration/MigrationStatusAdapter.kt
@@ -96,7 +96,7 @@ internal class MigrationStatusItemDecoration(
         parent: RecyclerView,
         state: RecyclerView.State
     ) {
-        val position = parent.getChildViewHolder(view).adapterPosition
+        val position = parent.getChildViewHolder(view).bindingAdapterPosition
         val itemCount = state.itemCount
 
         outRect.left = spacing
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapter.kt
new file mode 100644
index 000000000..d9bce5f3b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapter.kt
@@ -0,0 +1,67 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabtray
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.mozilla.fenix.R
+import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.Item
+import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.ViewHolder
+
+/**
+ * An adapter to display a single 'Save to Collections' button that can be used to display between
+ * multiple [RecyclerView.Adapter] in one [RecyclerView].
+ */
+class SaveToCollectionsButtonAdapter(
+    private val interactor: TabTrayInteractor
+) : ListAdapter<Item, ViewHolder>(DiffCallback) {
+
+    init {
+        submitList(listOf(Item))
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val itemView = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
+        return ViewHolder(itemView, interactor)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) = Unit
+
+    override fun getItemViewType(position: Int): Int {
+        return ViewHolder.LAYOUT_ID
+    }
+
+    private object DiffCallback : DiffUtil.ItemCallback<Item>() {
+        override fun areItemsTheSame(oldItem: Item, newItem: Item) = true
+
+        override fun areContentsTheSame(oldItem: Item, newItem: Item) = true
+    }
+
+    /**
+     * An object to identify the data type.
+     */
+    object Item
+
+    class ViewHolder(
+        itemView: View,
+        private val interactor: TabTrayInteractor
+    ) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        override fun onClick(v: View?) {
+            interactor.onEnterMultiselect()
+        }
+
+        companion object {
+            const val LAYOUT_ID = R.layout.tabs_tray_save_to_collections_item
+        }
+    }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index ee5d13bef..a3ccf9ed9 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayout
@@ -34,6 +35,7 @@ import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
+import mozilla.components.browser.tabstray.TabViewHolder
 import mozilla.components.support.ktx.android.util.dpToPx
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -69,6 +71,7 @@ class TabTrayView(
     private var menu: BrowserMenu? = null
 
     private var tabsTouchHelper: TabsTouchHelper
+    private val collectionsButtonAdapter = SaveToCollectionsButtonAdapter(interactor)
 
     private var hasLoaded = false
 
@@ -131,9 +134,13 @@ class TabTrayView(
                 reverseLayout = true
                 stackFromEnd = true
             }
-            adapter = tabsAdapter
+            adapter = ConcatAdapter(collectionsButtonAdapter, tabsAdapter)
+
+            tabsTouchHelper = TabsTouchHelper(
+                observable = tabsAdapter,
+                onViewHolderTouched = { it is TabViewHolder }
+            )
 
-            tabsTouchHelper = TabsTouchHelper(tabsAdapter)
             tabsTouchHelper.attachToRecyclerView(this)
 
             tabsAdapter.tabTrayInteractor = interactor
@@ -468,7 +475,11 @@ class TabTrayView(
             val selectedBrowserTabIndex = tabs
                 .indexOfFirst { it.id == sessionId }
 
-            layoutManager?.scrollToPosition(selectedBrowserTabIndex)
+            // We offset the tab index by the number of items in the other adapters.
+            // We add the offset, because the layoutManager is initialized with `reverseLayout`.
+            val recyclerViewIndex = selectedBrowserTabIndex + collectionsButtonAdapter.itemCount
+
+            layoutManager?.scrollToPosition(recyclerViewIndex)
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt
index ceecc6578..03fe38d43 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt
@@ -8,6 +8,7 @@ import android.graphics.Canvas
 import android.graphics.drawable.Drawable
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_IDLE
 import androidx.recyclerview.widget.RecyclerView
 import mozilla.components.browser.tabstray.TabTouchCallback
 import mozilla.components.concept.tabstray.TabsTray
@@ -18,72 +19,109 @@ import mozilla.components.support.ktx.android.util.dpToPx
 import org.mozilla.fenix.R
 import org.mozilla.fenix.home.sessioncontrol.SwipeToDeleteCallback
 
-class TabsTouchHelper(observable: Observable<TabsTray.Observer>) :
-    ItemTouchHelper(object : TabTouchCallback(observable) {
-        override fun onChildDraw(
-            c: Canvas,
-            recyclerView: RecyclerView,
-            viewHolder: RecyclerView.ViewHolder,
-            dX: Float,
-            dY: Float,
-            actionState: Int,
-            isCurrentlyActive: Boolean
-        ) {
-            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-            val icon = recyclerView.context.getDrawableWithTint(
-                R.drawable.ic_delete,
-                recyclerView.context.getColorFromAttr(R.attr.destructive)
-            )!!
-            val background = AppCompatResources.getDrawable(
-                recyclerView.context,
-                R.drawable.swipe_delete_background
-            )!!
-            val itemView = viewHolder.itemView
-            val iconLeft: Int
-            val iconRight: Int
-            val margin =
-                SwipeToDeleteCallback.MARGIN.dpToPx(recyclerView.context.resources.displayMetrics)
-            val iconWidth = icon.intrinsicWidth
-            val iconHeight = icon.intrinsicHeight
-            val cellHeight = itemView.bottom - itemView.top
-            val iconTop = itemView.top + (cellHeight - iconHeight) / 2
-            val iconBottom = iconTop + iconHeight
+/**
+ * A callback for consumers to know when a [RecyclerView.ViewHolder] is about to be touched.
+ * Return false if the default behaviour should be ignored.
+ */
+typealias OnViewHolderTouched = (RecyclerView.ViewHolder) -> Boolean
 
-            when {
-                dX > 0 -> { // Swiping to the right
-                    iconLeft = itemView.left + margin
-                    iconRight = itemView.left + margin + iconWidth
-                    background.setBounds(
-                        itemView.left, itemView.top,
-                        (itemView.left + dX).toInt() + SwipeToDeleteCallback.BACKGROUND_CORNER_OFFSET,
-                        itemView.bottom
-                    )
-                    icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
-                    draw(background, icon, c)
-                }
-                dX < 0 -> { // Swiping to the left
-                    iconLeft = itemView.right - margin - iconWidth
-                    iconRight = itemView.right - margin
-                    background.setBounds(
-                        (itemView.right + dX).toInt() - SwipeToDeleteCallback.BACKGROUND_CORNER_OFFSET,
-                        itemView.top, itemView.right, itemView.bottom
-                    )
-                    icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
-                    draw(background, icon, c)
-                }
-                else -> { // View not swiped
-                    background.setBounds(0, 0, 0, 0)
-                    icon.setBounds(0, 0, 0, 0)
-                }
+/**
+ * An [ItemTouchHelper] for handling tab swiping to delete.
+ *
+ * @param onViewHolderTouched See [OnViewHolderTouched].
+ */
+class TabsTouchHelper(
+    observable: Observable<TabsTray.Observer>,
+    onViewHolderTouched: OnViewHolderTouched = { true },
+    delegate: Callback = TouchCallback(observable, onViewHolderTouched)
+) : ItemTouchHelper(delegate)
+
+/**
+ * An [ItemTouchHelper.Callback] for drawing custom layouts on [RecyclerView.ViewHolder] interactions.
+ *
+ * @param onViewHolderTouched invoked when a tab is about to be swiped. See [OnViewHolderTouched].
+ */
+class TouchCallback(
+    observable: Observable<TabsTray.Observer>,
+    private val onViewHolderTouched: OnViewHolderTouched
+) : TabTouchCallback(observable) {
+
+    override fun getMovementFlags(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder
+    ): Int {
+        if (!onViewHolderTouched.invoke(viewHolder)) {
+            return ItemTouchHelper.Callback.makeFlag(ACTION_STATE_IDLE, 0)
+        }
+
+        return super.getMovementFlags(recyclerView, viewHolder)
+    }
+
+    override fun onChildDraw(
+        c: Canvas,
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        dX: Float,
+        dY: Float,
+        actionState: Int,
+        isCurrentlyActive: Boolean
+    ) {
+        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+
+        val icon = recyclerView.context.getDrawableWithTint(
+            R.drawable.ic_delete,
+            recyclerView.context.getColorFromAttr(R.attr.destructive)
+        )!!
+        val background = AppCompatResources.getDrawable(
+            recyclerView.context,
+            R.drawable.swipe_delete_background
+        )!!
+        val itemView = viewHolder.itemView
+        val iconLeft: Int
+        val iconRight: Int
+        val margin =
+            SwipeToDeleteCallback.MARGIN.dpToPx(recyclerView.context.resources.displayMetrics)
+        val iconWidth = icon.intrinsicWidth
+        val iconHeight = icon.intrinsicHeight
+        val cellHeight = itemView.bottom - itemView.top
+        val iconTop = itemView.top + (cellHeight - iconHeight) / 2
+        val iconBottom = iconTop + iconHeight
+
+        when {
+            dX > 0 -> { // Swiping to the right
+                iconLeft = itemView.left + margin
+                iconRight = itemView.left + margin + iconWidth
+                background.setBounds(
+                    itemView.left, itemView.top,
+                    (itemView.left + dX).toInt() + SwipeToDeleteCallback.BACKGROUND_CORNER_OFFSET,
+                    itemView.bottom
+                )
+                icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
+                draw(background, icon, c)
+            }
+            dX < 0 -> { // Swiping to the left
+                iconLeft = itemView.right - margin - iconWidth
+                iconRight = itemView.right - margin
+                background.setBounds(
+                    (itemView.right + dX).toInt() - SwipeToDeleteCallback.BACKGROUND_CORNER_OFFSET,
+                    itemView.top, itemView.right, itemView.bottom
+                )
+                icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
+                draw(background, icon, c)
+            }
+            else -> { // View not swiped
+                background.setBounds(0, 0, 0, 0)
+                icon.setBounds(0, 0, 0, 0)
             }
         }
+    }
 
-        private fun draw(
-            background: Drawable,
-            icon: Drawable,
-            c: Canvas
-        ) {
-            background.draw(c)
-            icon.draw(c)
-        }
-    })
+    private fun draw(
+        background: Drawable,
+        icon: Drawable,
+        c: Canvas
+    ) {
+        background.draw(c)
+        icon.draw(c)
+    }
+}
diff --git a/app/src/main/res/layout/tabs_tray_save_to_collections_item.xml b/app/src/main/res/layout/tabs_tray_save_to_collections_item.xml
new file mode 100644
index 000000000..25ecc2057
--- /dev/null
+++ b/app/src/main/res/layout/tabs_tray_save_to_collections_item.xml
@@ -0,0 +1,11 @@
+<?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/. -->
+<com.google.android.material.button.MaterialButton
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        style="@style/NeutralButton"
+        android:layout_margin="8dp"
+        android:text="@string/save_to_collection"
+        app:icon="@drawable/ic_tab_collection" />
\ No newline at end of file
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapterTest.kt
new file mode 100644
index 000000000..ba1f71d76
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/SaveToCollectionsButtonAdapterTest.kt
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabtray
+
+import android.widget.FrameLayout
+import io.mockk.mockk
+import io.mockk.verify
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.Item
+import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.ViewHolder
+import kotlin.random.Random
+
+@RunWith(FenixRobolectricTestRunner::class)
+class SaveToCollectionsButtonAdapterTest {
+
+    private lateinit var adapter: SaveToCollectionsButtonAdapter
+    private lateinit var interactor: TabTrayInteractor
+
+    @Before
+    fun setup() {
+        interactor = mockk(relaxed = true)
+        adapter = SaveToCollectionsButtonAdapter(interactor)
+    }
+
+    @Test
+    fun `create adapter only has one item in it`() {
+        assertEquals(1, adapter.itemCount)
+        assertTrue(adapter.currentList.first() is Item)
+    }
+
+    @Test
+    fun `viewholder click invokes interactor`() {
+        val itemView = FrameLayout(testContext)
+        val viewHolder = ViewHolder(itemView, interactor)
+
+        viewHolder.onClick(itemView)
+
+        verify { interactor.onEnterMultiselect() }
+    }
+
+    @Test
+    fun `always use the same layout`() {
+        assertEquals(ViewHolder.LAYOUT_ID, adapter.getItemViewType(Random.nextInt()))
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/TabsTouchHelperTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/TabsTouchHelperTest.kt
new file mode 100644
index 000000000..317e3085d
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/TabsTouchHelperTest.kt
@@ -0,0 +1,55 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.tabtray
+
+import android.widget.FrameLayout
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_IDLE
+import androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags
+import androidx.recyclerview.widget.RecyclerView
+import io.mockk.mockk
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+
+@RunWith(FenixRobolectricTestRunner::class)
+class TabsTouchHelperTest {
+
+    @Test
+    fun `movement flags remain unchanged if onSwipeToDelete is true`() {
+        val recyclerView = RecyclerView(testContext)
+        val layout = FrameLayout(testContext)
+        val interactor: TabTrayInteractor = mockk(relaxed = true)
+        val viewHolder = SaveToCollectionsButtonAdapter.ViewHolder(layout, interactor)
+        val callback = TouchCallback(mockk()) { true }
+
+        assertEquals(0, callback.getDragDirs(recyclerView, viewHolder))
+        assertEquals(ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT, callback.getSwipeDirs(recyclerView, viewHolder))
+
+        val actual = callback.getMovementFlags(recyclerView, viewHolder)
+        val expected = makeMovementFlags(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT)
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `movement flags remain unchanged if onSwipeToDelete is false`() {
+        val recyclerView = RecyclerView(testContext)
+        val layout = FrameLayout(testContext)
+        val interactor: TabTrayInteractor = mockk(relaxed = true)
+        val viewHolder = SaveToCollectionsButtonAdapter.ViewHolder(layout, interactor)
+        val callback = TouchCallback(mockk()) { false }
+
+        assertEquals(0, callback.getDragDirs(recyclerView, viewHolder))
+        assertEquals(ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT, callback.getSwipeDirs(recyclerView, viewHolder))
+
+        val actual = callback.getMovementFlags(recyclerView, viewHolder)
+        val expected = ItemTouchHelper.Callback.makeFlag(ACTION_STATE_IDLE, 0)
+
+        assertEquals(expected, actual)
+    }
+}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index c9c8c6261..043375927 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -23,7 +23,7 @@ object Versions {
     const val androidx_lifecycle = "2.2.0"
     const val androidx_fragment = "1.2.5"
     const val androidx_navigation = "2.3.0"
-    const val androidx_recyclerview = "1.1.0"
+    const val androidx_recyclerview = "1.2.0-alpha05"
     const val androidx_core = "1.2.0"
     const val androidx_paging = "2.1.0"
     const val androidx_transition = "1.3.0"

From 8d1bd10e6b00d270cfde13719fa91a8d8f6da7a3 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Mon, 27 Jul 2020 16:20:25 -0700
Subject: [PATCH 13/20] Test paged history provider

---
 .../history/PagedHistoryProvider.kt           |  5 +-
 .../history/PagedHistoryProviderTest.kt       | 53 +++++++++++++++++++
 .../DefaultBrowserToolbarControllerTest.kt    | 18 ++++++-
 3 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt

diff --git a/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt b/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt
index 7acaec215..41567f803 100644
--- a/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt
@@ -26,16 +26,17 @@ interface PagedHistoryProvider {
 // If we run this in our own coroutineScope it breaks the PagedList
 fun HistoryStorage.createSynchronousPagedHistoryProvider(): PagedHistoryProvider {
     return object : PagedHistoryProvider {
+
         override fun getHistory(
             offset: Long,
             numberOfItems: Long,
             onComplete: (List<VisitInfo>) -> Unit
         ) {
             runBlocking {
-                val history = this@createSynchronousPagedHistoryProvider.getVisitsPaginated(
+                val history = getVisitsPaginated(
                     offset,
                     numberOfItems,
-                    listOf(
+                    excludeTypes = listOf(
                         VisitType.NOT_A_VISIT,
                         VisitType.DOWNLOAD,
                         VisitType.REDIRECT_TEMPORARY,
diff --git a/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt b/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt
new file mode 100644
index 000000000..fe58e9a56
--- /dev/null
+++ b/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.components.history
+
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.verify
+import mozilla.components.concept.storage.HistoryStorage
+import mozilla.components.concept.storage.VisitInfo
+import mozilla.components.concept.storage.VisitType
+import org.junit.Before
+import org.junit.Test
+
+class PagedHistoryProviderTest {
+
+    private lateinit var storage: HistoryStorage
+
+    @Before
+    fun setup() {
+        storage = mockk()
+    }
+
+    @Test
+    fun `getHistory uses getVisitsPaginated`() {
+        val provider = storage.createSynchronousPagedHistoryProvider()
+        val results = listOf<VisitInfo>(mockk(), mockk())
+        val onComplete = mockk<(List<VisitInfo>) -> Unit>(relaxed = true)
+
+        coEvery { storage.getVisitsPaginated(any(), any(), any()) } returns results
+
+        provider.getHistory(10L, 5, onComplete)
+
+        coVerify {
+            storage.getVisitsPaginated(
+                offset = 10L,
+                count = 5,
+                excludeTypes = listOf(
+                    VisitType.NOT_A_VISIT,
+                    VisitType.DOWNLOAD,
+                    VisitType.REDIRECT_TEMPORARY,
+                    VisitType.RELOAD,
+                    VisitType.EMBED,
+                    VisitType.FRAMED_LINK,
+                    VisitType.REDIRECT_PERMANENT
+                )
+            )
+        }
+        verify { onComplete(results) }
+    }
+}
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index 5c69b4bf0..ec53861a2 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -66,7 +66,6 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.directionsEq
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.home.Tab
 import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -88,7 +87,6 @@ class DefaultBrowserToolbarControllerTest {
     @RelaxedMockK private lateinit var engineView: EngineView
     @RelaxedMockK private lateinit var currentSession: Session
     @RelaxedMockK private lateinit var openInFenixIntent: Intent
-    @RelaxedMockK private lateinit var currentSessionAsTab: Tab
     @RelaxedMockK private lateinit var metrics: MetricController
     @RelaxedMockK private lateinit var searchUseCases: SearchUseCases
     @RelaxedMockK private lateinit var sessionUseCases: SessionUseCases
@@ -185,6 +183,22 @@ class DefaultBrowserToolbarControllerTest {
         verify { onTabCounterClicked() }
     }
 
+    @Test
+    fun `handle reader mode enabled`() = runBlockingTest {
+        val controller = createController(scope = this)
+        controller.handleReaderModePressed(enabled = true)
+
+        verify { readerModeController.showReaderView() }
+    }
+
+    @Test
+    fun `handle reader mode disabled`() = runBlockingTest {
+        val controller = createController(scope = this)
+        controller.handleReaderModePressed(enabled = false)
+
+        verify { readerModeController.hideReaderView() }
+    }
+
     @Test
     fun handleToolbarClick() = runBlockingTest {
         every { currentSession.id } returns "1"

From 210f1ab89807688d72a46623be437098a175d5df Mon Sep 17 00:00:00 2001
From: amkcpu <amkcpu@outlook.com>
Date: Sun, 19 Jul 2020 15:00:27 +0200
Subject: [PATCH 14/20] For #12707 - Add vertical scrollbar to search
 suggestions

---
 app/src/main/res/layout/fragment_search.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 9a6e5873b..4cfc05aff 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -37,7 +37,8 @@
         app:layout_constraintBottom_toBottomOf="@id/search_divider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        android:scrollbars="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/scrollable_area"

From 791eac50f3ddcd38b1d6ed13959eb2f92a13cc8c Mon Sep 17 00:00:00 2001
From: amkcpu <amkcpu@outlook.com>
Date: Sun, 19 Jul 2020 14:22:23 +0200
Subject: [PATCH 15/20] For #12704 - Add vertical scrollbar to history screen

---
 app/src/main/res/layout/component_history.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml
index 4c4892e29..3452a6c5f 100644
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@@ -43,6 +43,7 @@
             android:id="@+id/history_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:scrollbars="vertical"
             tools:listitem="@layout/history_list_item"/>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

From af020d0af1f969a0adbcf6cfe299391a97a3f8d1 Mon Sep 17 00:00:00 2001
From: amkcpu <amkcpu@outlook.com>
Date: Sun, 19 Jul 2020 14:39:43 +0200
Subject: [PATCH 16/20] For #12706 - Add vertical scrollbar to bookmarks screen

---
 app/src/main/res/layout/component_bookmark.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/component_bookmark.xml b/app/src/main/res/layout/component_bookmark.xml
index ab4a74256..684c15735 100644
--- a/app/src/main/res/layout/component_bookmark.xml
+++ b/app/src/main/res/layout/component_bookmark.xml
@@ -21,6 +21,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:scrollbars="vertical"
             tools:listitem="@layout/library_site_item" />
 
         <TextView

From 6aa70977e75dd72aa8c6593b949df309d0b675e6 Mon Sep 17 00:00:00 2001
From: Kainalu Hagiwara <kainaluh808@gmail.com>
Date: Tue, 28 Jul 2020 13:06:32 -0700
Subject: [PATCH 17/20] For #12861 - Swap order of tabs for tab switching
 gesture.

---
 .../org/mozilla/fenix/browser/ToolbarGestureHandler.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
index 00508690d..11fe97a65 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt
@@ -180,14 +180,14 @@ class ToolbarGestureHandler(
             val sessions = sessionManager.sessionsOfType(currentSession.private)
             val index = when (gestureDirection) {
                 GestureDirection.RIGHT_TO_LEFT -> if (isLtr) {
-                    currentIndex + 1
-                } else {
                     currentIndex - 1
+                } else {
+                    currentIndex + 1
                 }
                 GestureDirection.LEFT_TO_RIGHT -> if (isLtr) {
-                    currentIndex - 1
-                } else {
                     currentIndex + 1
+                } else {
+                    currentIndex - 1
                 }
             }
 

From 0c8c87e56d1084ef95abde0274a24664904ac4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= <leonardoamurca@gmail.com>
Date: Mon, 20 Jul 2020 22:20:29 -0300
Subject: [PATCH 18/20] For #12755 - Replace @+id by @id when referencing
 already declared ids

When referencing an Android resource ID, you do not need the
plus-symbol if you declared before.
Caution: make sure that the resource you are referring to
is defined EARLIER and not LATER.
---
 ...component_collection_creation_select_collection.xml |  2 +-
 app/src/main/res/layout/custom_search_engine.xml       |  2 +-
 .../main/res/layout/fragment_add_on_permissions.xml    |  2 +-
 .../res/layout/fragment_installed_add_on_details.xml   | 10 +++++-----
 app/src/main/res/layout/fragment_search.xml            |  2 +-
 app/src/main/res/layout/fragment_sign_out.xml          |  6 +++---
 app/src/main/res/layout/locale_settings_item.xml       |  8 ++++----
 app/src/main/res/layout/logins_item.xml                |  4 ++--
 .../main/res/layout/onboarding_tracking_protection.xml |  2 +-
 .../main/res/layout/preference_widget_radiobutton.xml  |  2 +-
 app/src/main/res/layout/switch_with_description.xml    |  4 ++--
 app/src/main/res/navigation/nav_graph.xml              |  6 +++---
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index f08e5937b..bb2820dd8 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -88,7 +88,7 @@
         android:fadingEdgeLength="30dp"
         android:requiresFadingEdge="vertical"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_button_bar_layout"
+        app:layout_constraintBottom_toTopOf="@id/bottom_button_bar_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/back_button"
diff --git a/app/src/main/res/layout/custom_search_engine.xml b/app/src/main/res/layout/custom_search_engine.xml
index c389ce510..4ea1fd8cd 100644
--- a/app/src/main/res/layout/custom_search_engine.xml
+++ b/app/src/main/res/layout/custom_search_engine.xml
@@ -57,7 +57,7 @@
         android:layout_height="wrap_content"
         android:text="@string/search_add_custom_engine_search_string_example"
         android:lineHeight="18sp"
-        android:labelFor="@+id/edit_search_string"
+        android:labelFor="@id/edit_search_string"
         android:textColor="@android:color/tertiary_text_dark" />
 
     <org.mozilla.fenix.utils.LinkTextView
diff --git a/app/src/main/res/layout/fragment_add_on_permissions.xml b/app/src/main/res/layout/fragment_add_on_permissions.xml
index d7b1c9518..233518664 100644
--- a/app/src/main/res/layout/fragment_add_on_permissions.xml
+++ b/app/src/main/res/layout/fragment_add_on_permissions.xml
@@ -21,7 +21,7 @@
             android:id="@+id/learn_more_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/add_ons_permissions"
+            android:layout_below="@id/add_ons_permissions"
             android:background="?attr/selectableItemBackground"
             android:padding="16dp"
             android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml
index d32b326f4..2545ace01 100644
--- a/app/src/main/res/layout/fragment_installed_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_installed_add_on_details.xml
@@ -39,7 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|end"
-                android:layout_below="@+id/enable_switch"
+                android:layout_below="@id/enable_switch"
                 android:background="?android:attr/selectableItemBackground"
                 android:checked="false"
                 android:clickable="true"
@@ -56,7 +56,7 @@
                 android:id="@+id/settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/allow_in_private_browsing_switch"
+                android:layout_below="@id/allow_in_private_browsing_switch"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -70,7 +70,7 @@
                 android:id="@+id/details"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/settings"
+                android:layout_below="@id/settings"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -84,7 +84,7 @@
                 android:id="@+id/permissions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/details"
+                android:layout_below="@id/details"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -97,7 +97,7 @@
                 android:id="@+id/remove_add_on"
                 style="@style/DestructiveButton"
                 android:layout_marginHorizontal="16dp"
-                android:layout_below="@+id/permissions"
+                android:layout_below="@id/permissions"
                 android:text="@string/mozac_feature_addons_remove" />
         </RelativeLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4cfc05aff..d85e21d64 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -62,7 +62,7 @@
                 android:id="@+id/search_suggestions_onboarding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inflatedId="@+id/search_suggestions_onboarding"
+                android:inflatedId="@id/search_suggestions_onboarding"
                 android:layout="@layout/search_suggestions_onboarding"
                 app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_sign_out.xml b/app/src/main/res/layout/fragment_sign_out.xml
index 1b6abc701..2f2ea0730 100644
--- a/app/src/main/res/layout/fragment_sign_out.xml
+++ b/app/src/main/res/layout/fragment_sign_out.xml
@@ -27,8 +27,8 @@
         style="@style/SitePermissionCancelButton"
         android:text="@string/sign_out_cancel"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/signOutDisconnect"
-        app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
+        app:layout_constraintEnd_toStartOf="@id/signOutDisconnect"
+        app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/signOutDisconnect"
@@ -36,5 +36,5 @@
         android:text="@string/sign_out_disconnect"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
+        app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml
index 3dfee8628..511ae58c5 100644
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@@ -31,9 +31,9 @@
         android:textAlignment="viewStart"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
         android:textSize="@dimen/locale_item_title_size"
-        app:layout_constraintBottom_toTopOf="@+id/locale_subtitle_text"
+        app:layout_constraintBottom_toTopOf="@id/locale_subtitle_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
+        app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="English (United States)" />
@@ -51,8 +51,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
-        app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
-        app:layout_constraintTop_toBottomOf="@+id/locale_title_text"
+        app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
+        app:layout_constraintTop_toBottomOf="@id/locale_title_text"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="English (United States)" />
 
diff --git a/app/src/main/res/layout/logins_item.xml b/app/src/main/res/layout/logins_item.xml
index da5219276..08ed87f9f 100644
--- a/app/src/main/res/layout/logins_item.xml
+++ b/app/src/main/res/layout/logins_item.xml
@@ -46,7 +46,7 @@
         android:textColor="?primaryText"
         app:layout_constraintBottom_toTopOf="@id/usernameView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
+        app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
@@ -62,7 +62,7 @@
         android:textColor="?secondaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
+        app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
         app:layout_constraintTop_toBottomOf="@id/webAddressView"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index 78a7df377..46e07abd6 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -90,4 +90,4 @@
         app:onboardingKeyDescription="@string/onboarding_tracking_protection_strict_button_description_2"
         app:onboardingKeyTitle="@string/onboarding_tracking_protection_strict_option"
         tools:text="Strict" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_widget_radiobutton.xml b/app/src/main/res/layout/preference_widget_radiobutton.xml
index 9da09ef28..f65db43f3 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton.xml
@@ -38,7 +38,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         app:layout_constraintTop_toTopOf="@id/radio_button"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/radio_button"
+        app:layout_constraintStart_toEndOf="@id/radio_button"
         app:layout_constraintBottom_toBottomOf="@id/radio_button"/>
 
     <TextView
diff --git a/app/src/main/res/layout/switch_with_description.xml b/app/src/main/res/layout/switch_with_description.xml
index 9f7a84aa3..e7c7570c3 100644
--- a/app/src/main/res/layout/switch_with_description.xml
+++ b/app/src/main/res/layout/switch_with_description.xml
@@ -20,7 +20,7 @@
         android:importantForAccessibility="no"
         android:textAppearance="@style/ListItemTextStyle"
         android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@+id/trackingProtectionCategoryItemDescription"
+        app:layout_constraintBottom_toTopOf="@id/trackingProtectionCategoryItemDescription"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -41,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@id/trackingProtectionCategoryTitle"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionCategoryTitle"
+        app:layout_constraintTop_toBottomOf="@id/trackingProtectionCategoryTitle"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem" />
 
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 7e878d0fd..3bd6c282d 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <action
         android:id="@+id/action_global_home"
-        app:destination="@+id/homeFragment"
+        app:destination="@id/homeFragment"
         app:popUpTo="@id/homeFragment"
         app:popUpToInclusive="true" />
 
@@ -56,7 +56,7 @@
         app:destination="@id/settingsFragment" />
     <action
         android:id="@+id/action_global_syncedTabsFragment"
-        app:destination="@+id/syncedTabsFragment" />
+        app:destination="@id/syncedTabsFragment" />
     <action
         android:id="@+id/action_global_privateBrowsingFragment"
         app:destination="@id/privateBrowsingFragment" />
@@ -392,7 +392,7 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
-            app:popUpTo="@+id/settingsFragment" />
+            app:popUpTo="@id/settingsFragment" />
         <action
             android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
             app:destination="@id/sitePermissionsFragment"

From f692e8f82d528a43d26f770f1d37d9f2b61da5b0 Mon Sep 17 00:00:00 2001
From: Michael Hoye <mhoye@bespokeio.com>
Date: Mon, 27 Jul 2020 14:23:00 -0400
Subject: [PATCH 19/20] Reorganized to highlight the CPG and Bugzilla
 guidelines

---
 README.md | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index f83172937..19ab254c7 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,26 @@ Firefox Preview (internal code name: "Fenix") is an all-new browser for Android,
 
 ** Note: The team is currently experiencing heavy triage and review load, so when triaging issues, we will mainly be looking to identify [S1 (high severity)](https://github.com/mozilla-mobile/fenix/labels/S1) issues. See our triage process [here](https://github.com/mozilla-mobile/fenix/wiki/Triage-Process). Please be patient if you don't hear back from us immediately on your issue! **
 
+## Getting Involved
+
+Please read the [Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) and the [Bugzilla Etiquette guidelines](https://bugzilla.mozilla.org/page.cgi?id=etiquette.html) before filing an issue. This is our professional working environment as much as it is our bug tracker, and we want to keep our workspace clean and healthy.
+
+* [Guide to Contributing](https://github.com/mozilla-mobile/shared-docs/blob/master/android/CONTRIBUTING.md) (**New contributors start here!**)
+
+* Browse our [current Issues](https://github.com/mozilla-mobile/fenix/issues), or [file a security issue][sec issue].
+
+* Matrix: [#fenix:mozilla.org channel](https://chat.mozilla.org/#/room/#fenix:mozilla.org) (**We're available Monday-Friday, GMT and PST working hours**). Related channels:
+  * [#mobile-test-eng:mozilla.org channel](https://chat.mozilla.org/#/room/#mobile-test-eng:mozilla.org): for UI test automation
+  * [#perf-android-frontend:mozilla.org channel](https://chat.mozilla.org/#/room/#perf-android-frontend:mozilla.org): for front-end (JVM) performance of Android apps
+  * [#android-tips:mozilla.org channel](https://chat.mozilla.org/#/room/#android-tips:mozilla.org): for tips on Android development
+
+* Check out the [project wiki](https://github.com/mozilla-mobile/fenix/wiki) for more information.
+
+* Localization happens on [Pontoon](https://pontoon.mozilla.org/projects/android-l10n/). Please get in touch with delphine (at) mozilla (dot) com directly for more information.
+
+**Beginners!** - Watch out for [Issues with the "Good First Issue" label](https://github.com/mozilla-mobile/fenix/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). These are easy bugs that have been left for first timers to have a go, get involved and make a positive contribution to the project!
+
+
 ## I want to open a Pull Request!
 
 We encourage you to participate in this open source project. We love Pull Requests, Bug Reports, ideas, (security) code reviews or any other kind of positive contribution.
@@ -46,25 +66,6 @@ To make it easier to triage, we have these issue requirements:
 
 Please keep in mind that even though a feature you have in mind may seem like a small ask, as a small team, we have to prioritize our planned work and every new feature adds complexity and maintenance and may take up design, research, marketing, product, and engineering time. We appreciate everyone’s passion but we will not be able to incorporate every feature request or even fix every bug. That being said, just because we haven't replied, doesn't mean we don't care about the issue, please be patient with our response times as we're very busy.
 
-## Getting Involved
-
-Before you attempt to make a contribution please read the [Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/).
-
-* [Guide to Contributing](https://github.com/mozilla-mobile/shared-docs/blob/master/android/CONTRIBUTING.md) (**New contributors start here!**)
-
-* Browse our [current Issues](https://github.com/mozilla-mobile/fenix/issues), or [file a security issue][sec issue].
-
-* Matrix: [#fenix:mozilla.org channel](https://chat.mozilla.org/#/room/#fenix:mozilla.org) (**We're available Monday-Friday, GMT and PST working hours**). Related channels:
-  * [#mobile-test-eng:mozilla.org channel](https://chat.mozilla.org/#/room/#mobile-test-eng:mozilla.org): for UI test automation
-  * [#perf-android-frontend:mozilla.org channel](https://chat.mozilla.org/#/room/#perf-android-frontend:mozilla.org): for front-end (JVM) performance of Android apps
-  * [#android-tips:mozilla.org channel](https://chat.mozilla.org/#/room/#android-tips:mozilla.org): for tips on Android development
-
-* Check out the [project wiki](https://github.com/mozilla-mobile/fenix/wiki) for more information.
-
-* Localization happens on [Pontoon](https://pontoon.mozilla.org/projects/android-l10n/). Please get in touch with delphine (at) mozilla (dot) com directly for more information.
-
-**Beginners!** - Watch out for [Issues with the "Good First Issue" label](https://github.com/mozilla-mobile/fenix/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). These are easy bugs that have been left for first timers to have a go, get involved and make a positive contribution to the project!
-
 ## Build Instructions
 
 Pre-requisites:

From bef98698cb7db00ebe90e5fa0f275bf17e5658ea Mon Sep 17 00:00:00 2001
From: Kainalu Hagiwara <kainaluh808@gmail.com>
Date: Fri, 24 Jul 2020 09:42:01 -0700
Subject: [PATCH 20/20] For #12904 - Conditionally inflate SwipeGestureLayout
 in BaseBrowserFragment.

Changing the root view of BaseBrowserFragment from a CoordinatorLayout
to a SwipeGestureLayout has caused some regressions, particularly in
snackbar behavior. Lets prevent those regressions from occuring in
builds where the feature flag for gestures is off by only adding the
SwipeGestureLayout when the feature flag is on.
---
 .../java/org/mozilla/fenix/FeatureFlags.kt    |  4 +-
 .../fenix/browser/BaseBrowserFragment.kt      |  8 +-
 .../mozilla/fenix/browser/BrowserFragment.kt  |  5 +-
 .../res/layout/browser_gesture_wrapper.xml    | 17 ++++
 app/src/main/res/layout/fragment_browser.xml  | 94 ++++++++-----------
 5 files changed, 70 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/layout/browser_gesture_wrapper.xml

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index d37025e14..530d77be8 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -30,9 +30,9 @@ object FeatureFlags {
     val tabTray = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables swipe on toolbar to switch tabs
+     * Enables gestures on the browser chrome that depend on a [SwipeGestureLayout]
      */
-    val swipeToSwitchTabs = Config.channel.isNightlyOrDebug
+    val browserChromeGestures = Config.channel.isNightlyOrDebug
 
     /**
      * Enables viewing tab history
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 88e151f17..296769258 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -168,7 +168,13 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
         require(arguments != null)
         customTabSessionId = arguments?.getString(EXTRA_SESSION_ID)
 
-        val view = inflater.inflate(R.layout.fragment_browser, container, false)
+        val view = if (FeatureFlags.browserChromeGestures) {
+            inflater.inflate(R.layout.browser_gesture_wrapper, container, false).apply {
+                inflater.inflate(R.layout.fragment_browser, this as SwipeGestureLayout, true)
+            }
+        } else {
+            inflater.inflate(R.layout.fragment_browser, container, false)
+        }
 
         val activity = activity as HomeActivity
         activity.themeManager.applyStatusBarTheme(activity)
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 9c4f33728..1fd155f63 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.browser_gesture_wrapper.*
 import kotlinx.android.synthetic.main.fragment_browser.*
 import kotlinx.android.synthetic.main.fragment_browser.view.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -74,7 +75,9 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         val components = context.components
 
         return super.initializeUI(view)?.also {
-            if (FeatureFlags.swipeToSwitchTabs) {
+            // We need to wrap this whole thing in an if here because gestureLayout will not exist
+            // if the feature flag is off
+            if (FeatureFlags.browserChromeGestures) {
                 gestureLayout.addGestureListener(
                     ToolbarGestureHandler(
                         activity = requireActivity(),
diff --git a/app/src/main/res/layout/browser_gesture_wrapper.xml b/app/src/main/res/layout/browser_gesture_wrapper.xml
new file mode 100644
index 000000000..94f515687
--- /dev/null
+++ b/app/src/main/res/layout/browser_gesture_wrapper.xml
@@ -0,0 +1,17 @@
+<?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/. -->
+<org.mozilla.fenix.browser.SwipeGestureLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gestureLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.mozilla.fenix.browser.TabPreview
+        android:id="@+id/tabPreview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:focusable="false"
+        android:visibility="gone" />
+</org.mozilla.fenix.browser.SwipeGestureLayout>
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 63e9fde8d..328f9bedd 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -2,66 +2,52 @@
 <!-- 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/. -->
-<org.mozilla.fenix.browser.SwipeGestureLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gestureLayout"
+    android:id="@+id/browserLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="browser.BrowserFragment">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/browserLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefresh"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <mozilla.components.concept.engine.EngineView
-                android:id="@+id/engineView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone" />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-
-        <ViewStub
-            android:id="@+id/stubFindInPage"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_gravity="bottom"
-            android:inflatedId="@+id/findInPageView"
-            android:layout="@layout/stub_find_in_page" />
-
-        <include
-            android:id="@+id/viewDynamicDownloadDialog"
-            layout="@layout/download_dialog_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:visibility="gone" />
-
-        <mozilla.components.feature.readerview.view.ReaderViewControlsBar
-            android:id="@+id/readerViewControlsBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="?foundation"
-            android:elevation="24dp"
-            android:visibility="gone" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <org.mozilla.fenix.browser.TabPreview
-        android:id="@+id/tabPreview"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clickable="false"
-        android:focusable="false"
+        android:alpha="0"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <mozilla.components.concept.engine.EngineView
+            android:id="@+id/engineView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+    <ViewStub
+        android:id="@+id/stubFindInPage"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="bottom"
+        android:inflatedId="@+id/findInPageView"
+        android:layout="@layout/stub_find_in_page" />
+
+    <include
+        android:id="@+id/viewDynamicDownloadDialog"
+        layout="@layout/download_dialog_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
         android:visibility="gone" />
-</org.mozilla.fenix.browser.SwipeGestureLayout>
+
+    <mozilla.components.feature.readerview.view.ReaderViewControlsBar
+        android:id="@+id/readerViewControlsBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?foundation"
+        android:elevation="24dp"
+        android:visibility="gone" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>